Merge branch 'dev' of http://git.gicdev.com/dm4/welfare into dev

public/index.html

@@ -48,7 +48,7 @@
     <script src="//web-1251519181.file.myqcloud.com/components/preview-img.1.0.3.js"></script><!-- 图片预览 -->
     <script src="//web-1251519181.file.myqcloud.com/components/delete.1.1.4.js"></script><!-- 删除轻弹窗 -->
     <script src="//web-1251519181.file.myqcloud.com/components/input-number.1.0.12.js"></script><!-- 输入框 -->
-    <script src="//web-1251519181.file.myqcloud.com/components/welfare-selector.0.0.11.js"></script><!-- 福利选择器 -->
+    <script src="//web-1251519181.file.myqcloud.com/components/welfare-selector.0.0.15.js"></script><!-- 福利选择器 -->
     <script src="//web-1251519181.file.myqcloud.com/components/acc-group-select.1.0.5.js"></script><!-- 账号分组组件 -->
     <script src="//web-1251519181.file.myqcloud.com/components/editor.1.1.13.js"></script><!-- 富文本编辑器 -->
   </body>

src/views/card/card-package/form.vue

@@ -214,6 +214,14 @@ export default {
         delPackageItem(params).then(res => {
           this.cardLoading = false;
           this.refreshCouponList();
+          let callbackId = this.$route.query.callbackId;
+          if(callbackId) {
+            let obj = JSON.parse(localStorage.getItem('welfareCreateCallback') || '{}');
+            obj[callbackId] = false;
+            localStorage.setItem('welfareCreateCallback', JSON.stringify(obj));
+            obj[callbackId] = true;
+            localStorage.setItem('welfareCreateCallback', JSON.stringify(obj));
+          }
         }).catch(() => {
           this.cardLoading = false;
         });
@@ -277,6 +285,12 @@ export default {
             this.$tips({ message: `${ this.isAdd ? '新建' : '编辑' }成功`, type: 'success' });
             if(this.isAdd) {
               this.$store.commit('updateShowCornerCanUseApp', true);
+              let callbackId = this.$route.query.callbackId;
+              if(callbackId) {
+                let obj = JSON.parse(localStorage.getItem('welfareCreateCallback') || '{}');
+                obj[callbackId] = true;
+                localStorage.setItem('welfareCreateCallback', JSON.stringify(obj));
+              }
             }
             if(!this.isAdd) {
               this.$router.push('/card-package/list');

src/views/card/gic-card/card-form.js

@@ -842,6 +842,12 @@ export default {
         this.submitType = 1;
         this.loading = false;
         this.$store.commit('updateShowCornerCanUseApp', true);
+        let callbackId = this.$route.query.callbackId;
+        if(callbackId) {
+          let obj = JSON.parse(localStorage.getItem('welfareCreateCallback') || '{}');
+          obj[callbackId] = true;
+          localStorage.setItem('welfareCreateCallback', JSON.stringify(obj));
+        }
       }).catch(() => {
         this.loading = false;
       });
@@ -1020,4 +1026,4 @@ export default {
       }
     }
   },
-};
\ No newline at end of file
+};

src/views/gift-manage/real-gift-detail.vue

@@ -1493,6 +1493,12 @@ export default {
                 this.btnLoading = false;
                 this.$message.error(res.message);
               }
+              let callbackId = this.$route.query.callbackId;
+              if(callbackId) {
+                let obj = JSON.parse(localStorage.getItem('welfareCreateCallback') || '{}');
+                obj[callbackId] = true;
+                localStorage.setItem('welfareCreateCallback', JSON.stringify(obj));
+              }
             }).finally(() => this.$emit('updateLoading', false));
           }
         }

src/views/gift-manage/virtual-gift-detail.vue

@@ -658,6 +658,12 @@ export default {
               } else {
                 this.btnLoading = false;
                 this.$message.error(res.message);
+                let callbackId = this.$route.query.callbackId;
+                if(callbackId) {
+                  let obj = JSON.parse(localStorage.getItem('welfareCreateCallback') || '{}');
+                  obj[callbackId] = true;
+                  localStorage.setItem('welfareCreateCallback', JSON.stringify(obj));
+                }
               }
             }).finally(() => this.$emit('updateLoading'));
           }