jinx 4 лет назад
Родитель
Сommit
db5fb68838
3 измененных файлов с 84 добавлено и 18 удалено
  1. 3 6
      pc/src/page/login/components/login.vue
  2. 38 1
      pc/src/page/manage/temp/scene.vue
  3. 43 11
      pc/src/store/user.js

+ 3 - 6
pc/src/page/login/components/login.vue

@@ -119,12 +119,9 @@ export default {
           return
         }
         const from = this.$route.query.from
-        // if (from) {
-        //   this.$router.push(from)
-        // } else {
-        //   this.$router.push('/information')
-        // }
-        this.$router.push('/information')
+
+        // this.$router.push('/information')
+        this.$router.push('/scene')
       } catch (err) {
 
       }

+ 38 - 1
pc/src/page/manage/temp/scene.vue

@@ -14,6 +14,7 @@
         </ul>
       <div class="rig-con">
         <div class="btns" v-if="tabActive===1&&!isImgType">
+          <span  v-if="!deviceLogin" class="button" @click="handleSenceCopy()">{{ langScenes.share.copy }}</span>
           <span  v-if="!deviceLogin" class="button" @click="multCop">{{ $t('manage.sceneAdmin.collaborative') }}</span>
           <span class="button default" @click="multDel">{{ $t('common.delete') }}</span>
         </div>
@@ -75,6 +76,7 @@
                 <ul :style="{minWidth: language==='en'?'150px': '90px'}">
                   <li v-if="item.status === 1||item.status===-2 && item.payStatus !== -2" @click="gotoEdit(item)">{{langScenes.edit}}</li>
                   <li @click="handleCooperation(item)" v-if="(item.status === 1||item.status===-2)&&!deviceLogin && item.payStatus !== -2">{{langScenes.fenpei}}</li>
+                  <li @click="handleSenceCopy(item)" v-if="(item.status === 1||item.status===-2)&&!deviceLogin && item.payStatus !== -2">{{langScenes.share.copy}}</li>
                   <li v-if="item.status !== 0" @click="del(item)">{{langScenes.delete}}</li>
                 </ul>
               </template>
@@ -345,12 +347,47 @@ export default {
         })
       }
     },
+    async  handleSenceCopy (item) {
+      let params = {}
+      if (item) {
+        params.sceneNum = item.num
+      } else {
+        if (this.checkSelect()) {
+          params.sceneNum = this.selectedArr.map(item => {
+            return item.num
+          })
+          params.sceneNum = params.sceneNum.join(',')
+        } else {
+          return
+        }
+      }
+      console.log(params)
+
+      let res = await this.$http({
+        method: 'post',
+        data: params,
+        headers: {
+          token: this.token
+        },
+        url: '/scene/copyScene'
+      })
+      let data = res.data
+      if (data.code === 0) {
+        return this.$toast.show('warn', this.langScenes.share.copysuccess, () => {
+          this.currentPage = 1
+          this.getList()
+        })
+      }
+
+      // await this.$store.dispatch('copyUserScene', params)
+    },
     multDel () {
       if (this.checkSelect()) {
         let nums = this.selectedArr.map(item => {
           return item.num
         })
-        this.del(nums.join(','), true)
+        console.log(this.selectedArr)
+        // this.del(nums.join(','), true)
       }
     },
     deleteOneScene (row) {

+ 43 - 11
pc/src/store/user.js

@@ -28,8 +28,7 @@ try {
   Object.keys(dataObj).forEach(key => {
     dataObj[key] = localStorage && JSON.parse(localStorage.getItem(key))
   })
-} catch (error) {
-}
+} catch (error) {}
 
 export default {
   state: {
@@ -69,8 +68,7 @@ export default {
           state[key] = ''
           localStorage.setItem(key, '')
         })
-      } catch (error) {
-      }
+      } catch (error) {}
     },
 
     info (state, data) {
@@ -169,7 +167,10 @@ export default {
       context.commit('saveToken', token)
       if (token) {
         context.commit('DEVICELOGIN', '')
-        context.dispatch('getInfo', {url: '/user/getUserInfo', name: 'info'})
+        context.dispatch('getInfo', {
+          url: '/user/getUserInfo',
+          name: 'info'
+        })
         context.dispatch('getCart')
       }
       return res
@@ -192,7 +193,10 @@ export default {
       context.commit('saveToken', token)
       if (token) {
         context.commit('DEVICELOGIN', '')
-        context.dispatch('getInfo', {url: '/user/getUserInfo', name: 'info'})
+        context.dispatch('getInfo', {
+          url: '/user/getUserInfo',
+          name: 'info'
+        })
         context.dispatch('getCart')
       }
       return true
@@ -283,7 +287,10 @@ export default {
         url: '/user/invoice/mine'
       })
       if (info.data.code !== 0) return
-      context.commit('INVOICE', {type: data.type, data: info.data.data})
+      context.commit('INVOICE', {
+        type: data.type,
+        data: info.data.data
+      })
     },
 
     async getUserDevice (context, params) {
@@ -376,6 +383,24 @@ export default {
       context.commit('myScene', data.data)
     },
 
+    // 复制场景
+    async copyUserScene (context, params) {
+      let res = await http({
+        method: 'post',
+        data: params,
+        headers: {
+          token: context.state.token
+        },
+        url: '/scene/copyScene '
+      })
+
+      let data = res.data
+      // if (data.code !== 0) {
+
+      // }
+      // context.commit('myScene', data.data)
+    },
+
     async getCooperationScene (context, params) {
       let res = await http({
         method: 'post',
@@ -422,12 +447,20 @@ export default {
     },
     async getAuthCode (context, item) {
       let toastCode = localStorage.getItem('language') === 'en' ? toastEN : toastZH
-      let {phone, code, type = '', qudao, email} = item
+      let {
+        phone,
+        code,
+        type = '',
+        qudao,
+        email
+      } = item
       let areaNum = Number(code) || 86
 
       if (phone || email) {
         let resp = await http
-          .post('/sso/user/checkUser', {phoneNum: phone || email})
+          .post('/sso/user/checkUser', {
+            phoneNum: phone || email
+          })
 
         switch (type) {
           case 'resigter':
@@ -460,8 +493,7 @@ export default {
           method: 'post',
           data: params,
           url: '/sso/user/getMsgAuthCode'
-        }, res => {
-        })
+        }, res => {})
         return true
       } else {
         vue.$toast.show('warn', toastCode['29'])