Skip to content

C
clique-web
Commit 7679b49f by Kyle_Li
Options

Merge branch 'feature/积分制度bug' into 'master' 

Feature/积分制度bug

See merge request !1
parents 69098532 75d82f6f
Showing with 6 additions and 6 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-集团后台</title><link href=./static/css/main.8904e7a3c3d41e9606a28705c6f67dd7.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/group-people.2.0.08.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-group.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.05.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/export.1.0.1.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.46.js></script><script type=text/javascript src=./static/js/manifest.896d6ae1c4eb160695e4.js></script><script type=text/javascript src=./static/js/vendor.b8016fb88b6057c28cf3.js></script><script type=text/javascript src=./static/js/main.88734a052bc45edd56b3.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-集团后台</title><link href=./static/css/main.61608bfde357c1160b93ba76ea800497.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/group-people.2.0.08.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-group.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.05.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/export.1.0.1.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.46.js></script><script type=text/javascript src=./static/js/manifest.7fa16324f4328566e343.js></script><script type=text/javascript src=./static/js/vendor.b8016fb88b6057c28cf3.js></script><script type=text/javascript src=./static/js/main.88734a052bc45edd56b3.js></script></body></html>
\ No newline at end of file
dist/static/js/6.ab1dca08c733f300ba1a.js → dist/static/js/6.33a8c614b17cb307bcc7.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.896d6ae1c4eb160695e4.js → dist/static/js/manifest.7fa16324f4328566e343.js
!function(e){var f=window.webpackJsonp;window.webpackJsonp=function(a,n,r){for(var t,d,o,i=0,u=[];i<a.length;i++)d=a[i],c[d]&&u.push(c[d][0]),c[d]=0;for(t in n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t]);for(f&&f(a,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)o=b(b.s=r[i]);return o};var a={},c={45:0};function b(f){if(a[f])return a[f].exports;var c=a[f]={i:f,l:!1,exports:{}};return e[f].call(c.exports,c,c.exports,b),c.l=!0,c.exports}b.e=function(e){var f=c[e];if(0===f)return new Promise(function(e){e()});if(f)return f[2];var a=new Promise(function(a,b){f=c[e]=[a,b]});f[2]=a;var n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,b.nc&&r.setAttribute("nonce",b.nc),r.src=b.p+"static/js/"+e+"."+{0:"2f33ab3e109a5841fc0f",1:"385e557f391e558f5b52",2:"4400b301e978f2178b70",3:"603ec5bcb8045fafa6c6",4:"1a9062cf3b66d39d4b0c",5:"ffdcf04be84cb66de194",6:"ab1dca08c733f300ba1a",7:"c13128768479e817c19d",8:"7bea65cf0aaaa55be739",9:"0115c667339384926175",10:"267a736b0da367c20063",11:"40664d43b121d72c8da3",12:"14eff4e709242dff20ee",13:"767ff61451126a99fcbb",14:"72309a766accd310abb1",15:"caf452efc7b7ff8d5551",16:"0aeee92ce1726a867cce",17:"dabf1ec5bb70eb055bed",18:"0f0e36d73b1c908c0867",19:"a9543afaa4bab28978b1",20:"cc4a472f72765c729e6b",21:"3cd0b42d5b9cfb9320d8",22:"e5067f1fcc41b0a49160",23:"78d793b6286f4975bdcd",24:"60f0ab0163ae6f738507",25:"4296a39b67f0576f0f9f",26:"2b047f71ae5e4708f030",27:"8add0d2864601699f6cd",28:"68831fd985d520e286ee",29:"cd9f7f2dd605129d0844",30:"fff11bb4eebe6adc8237",31:"9ff68b0fadb91c34c9f3",32:"02df071160562b22e44e",33:"7db2ec0054954fc5c246",34:"fa6c8bb5d25818e42fae",35:"535ea612485b8f48eb93",36:"bd06c1abf17e00bb707a",37:"964e672dc955b70a5ad3",38:"2d79798421fc4dd5b59b",39:"ddcd9b5a1c35568ea4f4",40:"c502c6a8aff7b5fafad5",41:"4f76d3c2b4f43c67636e",42:"a1a5a3c5369ebb863e1a"}[e]+".js";var t=setTimeout(d,12e4);function d(){r.onerror=r.onload=null,clearTimeout(t);var f=c[e];0!==f&&(f&&f[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return r.onerror=r.onload=d,n.appendChild(r),a},b.m=e,b.c=a,b.d=function(e,f,a){b.o(e,f)||Object.defineProperty(e,f,{configurable:!1,enumerable:!0,get:a})},b.n=function(e){var f=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(f,"a",f),f},b.o=function(e,f){return Object.prototype.hasOwnProperty.call(e,f)},b.p="./",b.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.896d6ae1c4eb160695e4.js.map
\ No newline at end of file
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(f,n,r){for(var t,d,o,i=0,u=[];i<f.length;i++)d=f[i],a[d]&&u.push(a[d][0]),a[d]=0;for(t in n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t]);for(c&&c(f,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)o=b(b.s=r[i]);return o};var f={},a={45:0};function b(c){if(f[c])return f[c].exports;var a=f[c]={i:c,l:!1,exports:{}};return e[c].call(a.exports,a,a.exports,b),a.l=!0,a.exports}b.e=function(e){var c=a[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var f=new Promise(function(f,b){c=a[e]=[f,b]});c[2]=f;var n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,b.nc&&r.setAttribute("nonce",b.nc),r.src=b.p+"static/js/"+e+"."+{0:"2f33ab3e109a5841fc0f",1:"385e557f391e558f5b52",2:"4400b301e978f2178b70",3:"603ec5bcb8045fafa6c6",4:"1a9062cf3b66d39d4b0c",5:"ffdcf04be84cb66de194",6:"33a8c614b17cb307bcc7",7:"c13128768479e817c19d",8:"7bea65cf0aaaa55be739",9:"0115c667339384926175",10:"267a736b0da367c20063",11:"40664d43b121d72c8da3",12:"14eff4e709242dff20ee",13:"767ff61451126a99fcbb",14:"72309a766accd310abb1",15:"caf452efc7b7ff8d5551",16:"0aeee92ce1726a867cce",17:"dabf1ec5bb70eb055bed",18:"0f0e36d73b1c908c0867",19:"a9543afaa4bab28978b1",20:"cc4a472f72765c729e6b",21:"3cd0b42d5b9cfb9320d8",22:"e5067f1fcc41b0a49160",23:"78d793b6286f4975bdcd",24:"60f0ab0163ae6f738507",25:"4296a39b67f0576f0f9f",26:"2b047f71ae5e4708f030",27:"8add0d2864601699f6cd",28:"68831fd985d520e286ee",29:"cd9f7f2dd605129d0844",30:"fff11bb4eebe6adc8237",31:"9ff68b0fadb91c34c9f3",32:"02df071160562b22e44e",33:"7db2ec0054954fc5c246",34:"fa6c8bb5d25818e42fae",35:"535ea612485b8f48eb93",36:"bd06c1abf17e00bb707a",37:"964e672dc955b70a5ad3",38:"2d79798421fc4dd5b59b",39:"ddcd9b5a1c35568ea4f4",40:"c502c6a8aff7b5fafad5",41:"4f76d3c2b4f43c67636e",42:"a1a5a3c5369ebb863e1a"}[e]+".js";var t=setTimeout(d,12e4);function d(){r.onerror=r.onload=null,clearTimeout(t);var c=a[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return r.onerror=r.onload=d,n.appendChild(r),f},b.m=e,b.c=f,b.d=function(e,c,f){b.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:f})},b.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(c,"a",c),c},b.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},b.p="./",b.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.7fa16324f4328566e343.js.map
\ No newline at end of file
src/view/companyGroup/membershipSystem/pointSystem.vue
......@@ -48,7 +48,7 @@
</el-table-column>
<el-table-column prop="" label="微盟">
<template slot-scope="scope">
<span v-for="(item, index) in scope.row.channelList" v-show="item.channelType == 8" :key="index">
<span v-for="(item, index) in scope.row.channelList" v-show="item.channelType == 9" :key="index">
<span v-if="item.openStatus == 0">关闭</span>
<span v-else>
<span v-if="item.channelRelationProType == 1">通用</span>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment