wjx 1 year ago
parent
commit
2ebe43c0f9

File diff suppressed because it is too large
+ 0 - 0
src/assets/icons/svg/gift.svg


+ 1 - 0
src/assets/icons/svg/msg.svg

@@ -0,0 +1 @@
+<svg viewBox="64 64 896 896" focusable="false" data-icon="fund-view" width="1em" height="1em" fill="currentColor" aria-hidden="true"><path d="M512 227.555556c155.522844 0 281.895822 124.814222 284.404622 279.739733L796.444444 512v227.555556c0 31.419733-25.469156 56.888889-56.888888 56.888888H512c-157.092978 0-284.444444-127.351467-284.444444-284.444444s127.351467-284.444444 284.444444-284.444444z m0 34.133333c-138.24 0-250.311111 112.071111-250.311111 250.311111 0 136.863289 109.835378 248.069689 246.1696 250.276978L512 762.311111h227.555556a22.755556 22.755556 0 0 0 22.727111-21.617778l0.028444-1.137777V512.278756l-0.034133-4.431645C760.064 371.370667 648.704 261.688889 512 261.688889z" p-id="4284"></path><path d="M403.911111 438.044444m17.066667 0l210.488889 0q17.066667 0 17.066666 17.066667l0 0q0 17.066667-17.066666 17.066667l-210.488889 0q-17.066667 0-17.066667-17.066667l0 0q0-17.066667 17.066667-17.066667Z" p-id="4285"></path><path d="M403.911111 557.511111m17.066667 0l136.533333 0q17.066667 0 17.066667 17.066667l0 0q0 17.066667-17.066667 17.066666l-136.533333 0q-17.066667 0-17.066667-17.066666l0 0q0-17.066667 17.066667-17.066667Z" p-id="4286"></path></svg>

File diff suppressed because it is too large
+ 0 - 0
src/assets/icons/svg/roleManage.svg


+ 10 - 10
src/views/accounts/qwMapping/index.vue

@@ -153,7 +153,7 @@
                             v-for="item in gzhData"
                             :key="item.id"
                             :label="item.appName"
-                            :value="item.appName + '_' + item.appId">
+                            :value="item.appName + ',' + item.appId">
                         </el-option>
                     </el-select>
                 </el-form-item>
@@ -163,7 +163,7 @@
                             v-for="item in qwData"
                             :key="item.id"
                             :label="item.appName"
-                            :value="item.appName + '_' + item.appId">
+                            :value="item.appName + ',' + item.appId">
                         </el-option>
                     </el-select>
                 </el-form-item>
@@ -228,14 +228,14 @@ export default {
                     getChanelList({ platformKey: val }).then(res => {
                         let data = res.data
                         if (data && Array.isArray(data)) {
-                            this.gzhData = data.filter(item => item.type === 0)
+                            this.gzhData = data.filter(item => item.type === 0 || item.type === -1)
                             this.qwData = data.filter(item => item.type === 1)
                         }
                     })
                 }
             },
             immediate: true,
-        },
+        }
     },
     created() {
         this.getList()
@@ -284,10 +284,10 @@ export default {
             const { id, endTime, startTime, mpAppId, mpAppName, platformKey, qwAppId, qwAppName, resourceName} = row
             this.qwParamsForm = { startTime, id, endTime, platformKey, resourceName }
             if (mpAppId && mpAppName) {
-                this.$set(this.qwParamsForm, 'mpAppData', mpAppName + '_' + mpAppId);
+                this.$set(this.qwParamsForm, 'mpAppData', mpAppName + ',' + mpAppId);
             }
             if (qwAppId && qwAppName) {
-                this.$set(this.qwParamsForm, 'qwAppData', qwAppName + '_' + qwAppId);
+                this.$set(this.qwParamsForm, 'qwAppData', qwAppName + ',' + qwAppId);
             }
             this.visible = true
         },
@@ -306,13 +306,13 @@ export default {
                     if (Object.keys(this.qwParamsForm).includes('mpAppData') || Object.keys(this.qwParamsForm).includes('qwAppData')) {
                         let params = JSON.parse(JSON.stringify(this.qwParamsForm))
                         if (Object.keys(this.qwParamsForm).includes('mpAppData')) {
-                            params.mpAppName = params.mpAppData.split('_')[0]
-                            params.mpAppId = params.mpAppData.split('_')[1]
+                            params.mpAppName = params.mpAppData.split(',')[0]
+                            params.mpAppId = params.mpAppData.split(',')[1]
                             delete params.mpAppData
                         }
                         if (Object.keys(this.qwParamsForm).includes('qwAppData')) {
-                            params.qwAppName = params.qwAppData.split('_')[0]
-                            params.qwAppId = params.qwAppData.split('_')[1]
+                            params.qwAppName = params.qwAppData.split(',')[0]
+                            params.qwAppId = params.qwAppData.split(',')[1]
                             delete params.qwAppData
                         }
                         addOrEditQwChanel(params).then(res => {

Some files were not shown because too many files changed in this diff