SpaceOfCheng
/
admin
關注 3
收藏 0
複製 0
程式碼 問題 0 合併請求 0 版本發佈 2 活動
瀏覽代碼

ytj

yuantianjiao 6 年之前
父節點
f878cfd869 b25ab2ed74
當前提交
0ec46960b8
共有 8 個檔案被更改，包括 27 行新增 和 21 行删除
統一視圖 顯示文件統計
  1. 1
    1
      dist/index.html
  2. 1
    1
      src/pages/system/cardAndCouponManager/cardManager/index.vue
  3. 1
    1
      src/pages/system/cardAndCouponManager/couponManager/index.vue
  4. 4
    4
      src/pages/system/newOrder/newOrderList/index.vue
  5. 6
    4
      src/pages/system/systemSet/roleManager/index.vue
  6. 1
    1
      src/pages/system/verificationManager/drawVerification/verificationList/index.vue
  7. 3
    2
      src/pages/system/verificationManager/phoneVerification/verificationList/index.vue
  8. 10
    7
      src/store/system/role.js

+ 1
- 1
dist/index.html 查看文件

1 
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><link rel="shortcut icon" href=favorite.ico><title>城的空间后台管理系统</title><link href=./static/css/app.90669cc3fbc21880e606b85d1375e710.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.7e921535e20f729cf046.js></script><script type=text/javascript src=./static/js/app.ee8ac8bcfdbcedb227c3.js></script></body></html>
1 
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><link rel="shortcut icon" href=favorite.ico><title>城的空间后台管理系统</title><link href=./static/css/app.716ad2278248b4a8df5c21977ed2e460.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.992319e39e0ff64940a3.js></script><script type=text/javascript src=./static/js/app.24e7c3d97dc17a7e8e9a.js></script></body></html>

+ 1
- 1
src/pages/system/cardAndCouponManager/cardManager/index.vue 查看文件

92 
               size="mini"
92 
               size="mini"
93 
               type="success"
93 
               type="success"
94 
               v-if="scope.row.SendType === 'channel'"
94 
               v-if="scope.row.SendType === 'channel'"
95 
-              v-clipboard:copy="clientUrl + '/user.html#/receiveChannelShared/' + scope.row.CardId + '/card/receive'"
95 
+              v-clipboard:copy="clientUrl + 'user.html#/receiveChannelShared/' + scope.row.CardId + '/card/receive'"
96 
               v-clipboard:success="onCopy"
96 
               v-clipboard:success="onCopy"
97 
               v-clipboard:error="onError"
97 
               v-clipboard:error="onError"
98 
               >点击复制链接</el-button>
98 
               >点击复制链接</el-button>

+ 1
- 1
src/pages/system/cardAndCouponManager/couponManager/index.vue 查看文件

87 
               size="mini"
87 
               size="mini"
88 
               type="success"
88 
               type="success"
89 
               v-if="scope.row.SendType === 'channel'"
89 
               v-if="scope.row.SendType === 'channel'"
90 
-              v-clipboard:copy="clientUrl + '/user.html#/receiveChannelShared/' + scope.row.CouponId + '/coupon/receive'"
90 
+              v-clipboard:copy="clientUrl + 'user.html#/receiveChannelShared/' + scope.row.CouponId + '/coupon/receive'"
91 
               v-clipboard:success="onCopy"
91 
               v-clipboard:success="onCopy"
92 
               v-clipboard:error="onError"
92 
               v-clipboard:error="onError"
93 
               >点击复制链接</el-button>
93 
               >点击复制链接</el-button>

+ 4
- 4
src/pages/system/newOrder/newOrderList/index.vue 查看文件

8 
         </div>
8 
         </div>
9 
         <ul>
9 
         <ul>
10 
           <li>
10 
           <li>
11 
-            <el-select v-model="caseid" placeholder="请选择案场">
11 
+            <el-select v-model="CaseId" placeholder="请选择案场">
12 
               <el-option
12 
               <el-option
13 
                 v-for="item in cases"
13 
                 v-for="item in cases"
14 
                 :key="item.CaseId"
14 
                 :key="item.CaseId"
151 
         console.log(key, this.websockets[key])
151 
         console.log(key, this.websockets[key])
152 
         this.websockets[key].onclose()
152 
         this.websockets[key].onclose()
153 
       })
153 
       })
154 
-      console.log('init')
154 
+      // console.log('init')
155 
       var param = []
155 
       var param = []
156 
-      if (!this.caseid) {
156 
+      if (!this.CaseId) {
157 
         this.$message({
157 
         this.$message({
158 
           type: 'info',
158 
           type: 'info',
159 
           message: '请先选择案场'
159 
           message: '请先选择案场'
161 
         return
161 
         return
162 
       }
162 
       }
163 
       clearInterval(this.interval)
163 
       clearInterval(this.interval)
164 
-      this.GetOrdersList({ caseid: this.caseid }).then((res) => {
164 
+      this.GetOrdersList({ caseid: this.CaseId }).then((res) => {
165 
         for (var n = 0; n < (res.list || []).length; n++) {
165 
         for (var n = 0; n < (res.list || []).length; n++) {
166 
           if (res.list[n].IsIntimidate === 0) {
166 
           if (res.list[n].IsIntimidate === 0) {
167 
             param.push(res.list[n].OrdersId)
167 
             param.push(res.list[n].OrdersId)

+ 6
- 4
src/pages/system/systemSet/roleManager/index.vue 查看文件

67 
       key: '',
67 
       key: '',
68 
       selid: '',
68 
       selid: '',
69 
       dialogTableVisible: false,
69 
       dialogTableVisible: false,
70 
+      roleMenus: [],
70 
     }
71 
     }
71 
   },
72 
   },
72 
   computed: {
73 
   computed: {
73 
     ...mapRoleState({
74 
     ...mapRoleState({
74 
       roles: x => x.roleList,
75 
       roles: x => x.roleList,
75 
-      roleMenus: x => x.roleMenus,
76 
+      // roleMenus: x => x.roleMenus,
76 
     }),
77 
     }),
77 
     ...mapState({
78 
     ...mapState({
78 
       menus: x => x.app.menus
79 
       menus: x => x.app.menus
136 
     },
137 
     },
137 
     handlePermission (index, row) {
138 
     handlePermission (index, row) {
138 
       this.selid = row.RoleId
139 
       this.selid = row.RoleId
139 
-      this.GetRoleMenu({id: this.selid})
140 
-      console.log(this.roleMenus)
141 
-      this.dialogTableVisible = true
140 
+      this.GetRoleMenu({id: this.selid}).then((res) => {
141 
+        this.roleMenus = res || []
142 
+        this.dialogTableVisible = true
143 
+      })
142 
     },
144 
     },
143 
     handleNodeClick (node) {
145 
     handleNodeClick (node) {
144 
       console.log(node)
146 
       console.log(node)

+ 1
- 1
src/pages/system/verificationManager/drawVerification/verificationList/index.vue 查看文件

132 
       this.getList()
132 
       this.getList()
133 
     },
133 
     },
134 
     reback () { // 返回
134 
     reback () { // 返回
135 
-      this.$router.push({ name: 'drawVerificationList' })
135 
+      this.$router.push({ name: 'drawVerification' })
136 
     },
136 
     },
137 
   }
137 
   }
138 
 }
138 
 }

+ 3
- 2
src/pages/system/verificationManager/phoneVerification/verificationList/index.vue 查看文件

173 
         page: 1,
173 
         page: 1,
174 
         pagesize: 10
174 
         pagesize: 10
175 
       },
175 
       },
176 
+      currentItem: {},
176 
     }
177 
     }
177 
   },
178 
   },
178 
   mounted () {
179 
   mounted () {
242 
       this.dialogVisible = false
243 
       this.dialogVisible = false
243 
       this.getKeyList({
244 
       this.getKeyList({
244 
         ...this.postData,
245 
         ...this.postData,
245 
-        caseid: this.CaseId,
246 
+        caseid: this.currentItem.CaseId,
246 
       }).then((res) => {
247 
       }).then((res) => {
247 
         // console.log(JSON.stringify(res))
248 
         // console.log(JSON.stringify(res))
248 
         this.dialogTotal = res.pagenum
249 
         this.dialogTotal = res.pagenum
291 
       this.postData.page = val
292 
       this.postData.page = val
292 
       this.getKeyList({
293 
       this.getKeyList({
293 
         ...this.postData,
294 
         ...this.postData,
294 
-        caseid: this.CaseId,
295 
+        caseid: this.currentItem.CaseId,
295 
       }).then((res) => {
296 
       }).then((res) => {
296 
         // console.log(JSON.stringify(res))
297 
         // console.log(JSON.stringify(res))
297 
         this.dialogTotal = res.pagenum
298 
         this.dialogTotal = res.pagenum

+ 10
- 7
src/store/system/role.js 查看文件

79 
       commit('updateInfo', {})
 79 
       commit('updateInfo', {})
80 
     },
 80 
     },
81 
     GetRoleMenu ({ commit }, payload) {
 81 
     GetRoleMenu ({ commit }, payload) {
82 
-      ajax(api.role.getmenus.url, {
83 
-        method: api.role.getmenus.method,
84 
-        urlData: {
85 
-          id: payload.id,
86 
-        },
87 
-      }).then(res => {
88 
-        commit('updateRoleMenus', res)
82 
+      return new Promise((resolve, reject) => {
83 
+        ajax(api.role.getmenus.url, {
84 
+          method: api.role.getmenus.method,
85 
+          urlData: {
86 
+            id: payload.id,
87 
+          },
88 
+        }).then(res => {
89 
+          commit('updateRoleMenus', res)
90 
+          resolve(res)
91 
+        }).catch(reject)
89 
       })
 92 
       })
90 
     },
 93 
     },
91 
     SaveRoleMenus ({ commit }, payload) {
 94 
     SaveRoleMenus ({ commit }, payload) {