Skip to content

H
haoban-3
Commit 8c6dc1d6 by caoyanzhi
Options

Merge branch 'bugfix/客户展示设置UI' into dev 

# Conflicts:
#	dist/index.html
#	dist/static/css/app.609bdb3c48d5fadf0125bb4182b4f38f.css
#	dist/static/css/app.9909a865bae78819a1fec04ecb902d42.css
#	dist/static/css/app.f8e4ef5f6c158e0ca638340ca3e4a32b.css
#	dist/static/js/manifest.158a3d3d8a7755d2b7d5.js
#	dist/static/js/manifest.9c459d4ec8d6d092a283.js
#	dist/static/js/manifest.b83ca238b60e77a84e03.js
parents 403c429a 8836d725
Showing with 22 additions and 7 deletions
dist/index.html
<<<<<<< HEAD
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.69.css><link rel=stylesheet type=text/css href=//at.alicdn.com/t/font_1628375_vcg1gtmx7lb.css><script src=//at.alicdn.com/t/font_1628375_vcg1gtmx7lb.js></script><link rel=stylesheet href=//at.alicdn.com/t/font_2859043_udehp133w1.css><link rel="shortcut icon" href=./favicon.ico><link href=./static/css/app.609bdb3c48d5fadf0125bb4182b4f38f.css rel=stylesheet></head><body class=damolish><div id=app></div><script>(function() {
=======
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.69.css><link rel=stylesheet type=text/css href=//at.alicdn.com/t/font_1628375_vcg1gtmx7lb.css><script src=//at.alicdn.com/t/font_1628375_vcg1gtmx7lb.js></script><link rel=stylesheet href=//at.alicdn.com/t/font_2859043_udehp133w1.css><link rel="shortcut icon" href=./favicon.ico><link href=./static/css/app.f8e4ef5f6c158e0ca638340ca3e4a32b.css rel=stylesheet></head><body class=damolish><div id=app></div><script>(function() {
>>>>>>> bugfix/客户展示设置UI
var src = '/component/static/import-component.js?timestrap='+ new Date().getTime();
var host = window.location.host;
host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host;
document.write('<script src="//'+ host + src +'"><\/script>')
})()</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/common.1.0.3.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-data.1.0.11.js></script><script type=text/javascript src=./static/js/manifest.9c459d4ec8d6d092a283.js></script><script type=text/javascript src=./static/js/vendor.a627dbe0ae44f8550153.js></script><script type=text/javascript src=./static/js/app.f9a209c4e267560fa9d0.js></script></body></html>
\ No newline at end of file
<<<<<<< HEAD
})()</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/common.1.0.3.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-data.1.0.11.js></script><script type=text/javascript src=./static/js/manifest.9c459d4ec8d6d092a283.js></script><script type=text/javascript src=./static/js/vendor.a627dbe0ae44f8550153.js></script><script type=text/javascript src=./static/js/app.f9a209c4e267560fa9d0.js></script></body></html>
=======
})()</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/common.1.0.3.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-data.1.0.11.js></script><script type=text/javascript src=./static/js/manifest.b83ca238b60e77a84e03.js></script><script type=text/javascript src=./static/js/vendor.a627dbe0ae44f8550153.js></script><script type=text/javascript src=./static/js/app.b05eb38263c2e832a44a.js></script></body></html>
>>>>>>> bugfix/客户展示设置UI
dist/static/css/app.609bdb3c48d5fadf0125bb4182b4f38f.css
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.f8e4ef5f6c158e0ca638340ca3e4a32b.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.b83ca238b60e77a84e03.js 0 → 100644
<<<<<<< HEAD:dist/static/js/manifest.9c459d4ec8d6d092a283.js
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,d,n){for(var r,t,o,i=0,u=[];i<c.length;i++)t=c[i],b[t]&&u.push(b[t][0]),b[t]=0;for(r in d)Object.prototype.hasOwnProperty.call(d,r)&&(e[r]=d[r]);for(a&&a(c,d,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=f(f.s=n[i]);return o};var c={},b={109:0};function f(a){if(c[a])return c[a].exports;var b=c[a]={i:a,l:!1,exports:{}};return e[a].call(b.exports,b,b.exports,f),b.l=!0,b.exports}f.e=function(e){var a=b[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,f){a=b[e]=[c,f]});a[2]=c;var d=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,f.nc&&n.setAttribute("nonce",f.nc),n.src=f.p+"static/js/"+e+"."+{0:"c2b7c0cd63ec18653664",1:"fd15a7f381f3fc4a55fe",2:"2c3bd054259fdef03d32",3:"ce79c2a4ab8bd5f73c6d",4:"dd5af758b7b52a6a9234",5:"1118b826a3025b9da73d",6:"8ce178bff02820b743a4",7:"eaa096334749222ac860",8:"eaa04f0cd4338561211b",9:"629a39217ca171d7a1f4",10:"3bb71263abb8e1a618c5",11:"9212e6f38151d9b2064f",12:"f165045a1588bbfe0004",13:"4490852bce884d821981",14:"7a7d250063732274b236",15:"77b3db23ff45ba6fa01a",16:"9fb4971e7df1e7393ad1",17:"5c7e2d35eb188a869314",18:"a000dd825dabd61fe2fd",19:"c04ac097e2bbdace131c",20:"8dd9a8b6a7e1c7272165",21:"5f105b7d23caa93caaa3",22:"f64a06eacf065f75199a",23:"2a04b626287b6eff60b7",24:"fd2745ac203ea3627efd",25:"1a7ea9e677d38a820910",26:"fbf825f47bdbd91acfb5",27:"116ad9b10e5ad88565a4",28:"462eebca27a165eb34c1",29:"c1d34156972ca000d871",30:"d5b90d6e2eacb71142d5",31:"e4bdc072b982249effbf",32:"6d5eaa4acbfed3007c26",33:"d38ec71b66d58e70b446",34:"1bf720cf858a1a3f37cf",35:"4f7b4ac77ee6b02b4191",36:"718beac7566b0f2ad8dd",37:"10762b6bcae7765786f2",38:"352fb235f29a83db6d8e",39:"b1d386d62730ad0133eb",40:"71f9543e980b76100aa3",41:"c3b41272c854ad26307f",42:"5a422047fcf3f0f60167",43:"0ecf1086e96f6dee9f7a",44:"0ca6ce81de527bbf78ba",45:"da0b9212692b750c2cb4",46:"334679c5ff0c5b0dcecf",47:"3b09766193f69a632197",48:"1d5e0b582edf0922d908",49:"807401f5792ada71e97a",50:"a1015b29c62714ed4720",51:"3d27cc017de523b3681b",52:"6787e341b6db605d59cb",53:"2054052aba70bb38ed8b",54:"bd74a8552e242d23a2a3",55:"8e5a59b31576b8166215",56:"b79f8e0ef4abe334c247",57:"896a692a308e621c4708",58:"6c492cf0857ac4b17875",59:"9f151b5bdfecf453bea0",60:"bb76a745c4bb599d309f",61:"e546948215b9a5c4b5a6",62:"81110b3692cf11009820",63:"6515da8816b70ce892ed",64:"705f7b2b5cc9ff15988f",65:"1f818ef70dc8c00a03c9",66:"ef9b45f25efacaeb2a6e",67:"5d5badfc2a167e2a371b",68:"75ce985994b52d0989ac",69:"b77aebc03c0cc5b20a6c",70:"4f90c0e655cfb7093805",71:"f223f08905ddcbf1c937",72:"b88dade8d03805e3b11d",73:"fa5150d7ecab16c9ac80",74:"c08af2069b1140954569",75:"99a5cfd3433737dbdd91",76:"a37ab425d4da4ce4b078",77:"b2faee0c81f8d825c1e2",78:"7fa8536acb12b5ca3320",79:"ddbc5dd0f86cf21fb297",80:"2ba1c014b2f05b03d2f4",81:"9c414a03690822714e56",82:"d6af80b1760253c84c89",83:"dd23d1e732f2559371c1",84:"c38cae3e613a1118eead",85:"dc1d63d55185a5fba84e",86:"e1c67456b2cd81e1f52f",87:"f95ff92f9d0ef740609b",88:"bee4daf9bb8e8080b451",89:"9480aeb0e022a49097f0",90:"e1a3749d2484a7b5cdd6",91:"c8874462a9fd749e735c",92:"114c61278405063243d4",93:"fd6c9e73ba79cc8ecde8",94:"9968380c67559ba75e02",95:"d10379f5a0cc098715eb",96:"577809632c9109487d84",97:"2f7e34d05c2acea4c0c4",98:"a291ae3913ba5d4b5db9",99:"09304176be8343a9cfd5",100:"a09770f8e3705f60fc92",101:"aa785281d7787f809c0f",102:"c007e25f7b6524898a68",103:"77d590f5673c8224a69d",104:"553730ee1a4ec413db04",105:"a36747019c4eb8e8e583",106:"afd6aea8a066e9a82fe4"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var a=b[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),b[e]=void 0)}return n.onerror=n.onload=t,d.appendChild(n),c},f.m=e,f.c=c,f.d=function(e,a,c){f.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},f.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(a,"a",a),a},f.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},f.p="./",f.oe=function(e){throw console.error(e),e}}([]);
=======
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,d,n){for(var r,t,o,i=0,u=[];i<c.length;i++)t=c[i],b[t]&&u.push(b[t][0]),b[t]=0;for(r in d)Object.prototype.hasOwnProperty.call(d,r)&&(e[r]=d[r]);for(a&&a(c,d,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=f(f.s=n[i]);return o};var c={},b={109:0};function f(a){if(c[a])return c[a].exports;var b=c[a]={i:a,l:!1,exports:{}};return e[a].call(b.exports,b,b.exports,f),b.l=!0,b.exports}f.e=function(e){var a=b[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,f){a=b[e]=[c,f]});a[2]=c;var d=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,f.nc&&n.setAttribute("nonce",f.nc),n.src=f.p+"static/js/"+e+"."+{0:"ea3d3111165631e19b0c",1:"fd15a7f381f3fc4a55fe",2:"2c3bd054259fdef03d32",3:"ce79c2a4ab8bd5f73c6d",4:"dd5af758b7b52a6a9234",5:"1118b826a3025b9da73d",6:"8ce178bff02820b743a4",7:"eaa096334749222ac860",8:"eaa04f0cd4338561211b",9:"629a39217ca171d7a1f4",10:"3bb71263abb8e1a618c5",11:"9212e6f38151d9b2064f",12:"f165045a1588bbfe0004",13:"4490852bce884d821981",14:"7a7d250063732274b236",15:"77b3db23ff45ba6fa01a",16:"9fb4971e7df1e7393ad1",17:"5c7e2d35eb188a869314",18:"a000dd825dabd61fe2fd",19:"c04ac097e2bbdace131c",20:"8dd9a8b6a7e1c7272165",21:"5f105b7d23caa93caaa3",22:"f64a06eacf065f75199a",23:"2a04b626287b6eff60b7",24:"fd2745ac203ea3627efd",25:"1a7ea9e677d38a820910",26:"fbf825f47bdbd91acfb5",27:"116ad9b10e5ad88565a4",28:"462eebca27a165eb34c1",29:"c1d34156972ca000d871",30:"d5b90d6e2eacb71142d5",31:"e4bdc072b982249effbf",32:"6d5eaa4acbfed3007c26",33:"d38ec71b66d58e70b446",34:"1bf720cf858a1a3f37cf",35:"4f7b4ac77ee6b02b4191",36:"718beac7566b0f2ad8dd",37:"10762b6bcae7765786f2",38:"352fb235f29a83db6d8e",39:"b1d386d62730ad0133eb",40:"71f9543e980b76100aa3",41:"c3b41272c854ad26307f",42:"5a422047fcf3f0f60167",43:"0ecf1086e96f6dee9f7a",44:"0ca6ce81de527bbf78ba",45:"da0b9212692b750c2cb4",46:"334679c5ff0c5b0dcecf",47:"3b09766193f69a632197",48:"1d5e0b582edf0922d908",49:"807401f5792ada71e97a",50:"a1015b29c62714ed4720",51:"3d27cc017de523b3681b",52:"6787e341b6db605d59cb",53:"2054052aba70bb38ed8b",54:"bd74a8552e242d23a2a3",55:"8e5a59b31576b8166215",56:"b79f8e0ef4abe334c247",57:"896a692a308e621c4708",58:"6c492cf0857ac4b17875",59:"9f151b5bdfecf453bea0",60:"bb76a745c4bb599d309f",61:"e546948215b9a5c4b5a6",62:"81110b3692cf11009820",63:"6515da8816b70ce892ed",64:"705f7b2b5cc9ff15988f",65:"1f818ef70dc8c00a03c9",66:"ef9b45f25efacaeb2a6e",67:"5d5badfc2a167e2a371b",68:"75ce985994b52d0989ac",69:"b77aebc03c0cc5b20a6c",70:"4f90c0e655cfb7093805",71:"f223f08905ddcbf1c937",72:"b88dade8d03805e3b11d",73:"fa5150d7ecab16c9ac80",74:"c08af2069b1140954569",75:"99a5cfd3433737dbdd91",76:"a37ab425d4da4ce4b078",77:"b2faee0c81f8d825c1e2",78:"7fa8536acb12b5ca3320",79:"ddbc5dd0f86cf21fb297",80:"2ba1c014b2f05b03d2f4",81:"9c414a03690822714e56",82:"d6af80b1760253c84c89",83:"dd23d1e732f2559371c1",84:"c38cae3e613a1118eead",85:"dc1d63d55185a5fba84e",86:"e1c67456b2cd81e1f52f",87:"f95ff92f9d0ef740609b",88:"bee4daf9bb8e8080b451",89:"9480aeb0e022a49097f0",90:"e1a3749d2484a7b5cdd6",91:"c8874462a9fd749e735c",92:"114c61278405063243d4",93:"fd6c9e73ba79cc8ecde8",94:"9968380c67559ba75e02",95:"d10379f5a0cc098715eb",96:"577809632c9109487d84",97:"2f7e34d05c2acea4c0c4",98:"a291ae3913ba5d4b5db9",99:"09304176be8343a9cfd5",100:"a09770f8e3705f60fc92",101:"aa785281d7787f809c0f",102:"c007e25f7b6524898a68",103:"77d590f5673c8224a69d",104:"553730ee1a4ec413db04",105:"a36747019c4eb8e8e583",106:"afd6aea8a066e9a82fe4"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var a=b[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),b[e]=void 0)}return n.onerror=n.onload=t,d.appendChild(n),c},f.m=e,f.c=c,f.d=function(e,a,c){f.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},f.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(a,"a",a),a},f.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},f.p="./",f.oe=function(e){throw console.error(e),e}}([]);
>>>>>>> bugfix/客户展示设置UI:dist/static/js/manifest.b83ca238b60e77a84e03.js
src/views/apps/customerApp/memberShowSet.vue
......@@ -18,13 +18,16 @@
</el-table-column>
<el-table-column label="策略类型" prop="storeType" :formatter="(row, col, val) => (val == '-999' ? '通用策略' : '特殊策略')" min-width="110px"></el-table-column>
<el-table-column label="门店类型" prop="storeType" :formatter="formatStoreType" min-width="110px"></el-table-column>
<el-table-column label="设置内容" min-width="310px">
<el-table-column label="设置内容" min-width="310px" show-overflow-tooltip>
<template slot-scope="{ row }">{{ formatSetting(row) }}</template>
</el-table-column>
<el-table-column label="创建人" prop="creatorName" min-width="90px"></el-table-column>
<el-table-column label="编辑人" prop="modifierName" min-width="90px"></el-table-column>
<el-table-column label="最近编辑时间" prop="updateTime" min-width="170px">
<template slot-scope="{ row }">{{ row.updateTime | formatTimeStamp }}</template>
<el-table-column label="创建人" prop="creatorName" min-width="120px" show-overflow-tooltip></el-table-column>
<el-table-column label="编辑人" prop="modifierName" min-width="120px" show-overflow-tooltip></el-table-column>
<el-table-column label="最近编辑时间" prop="updateTime" min-width="110px">
<div style="line-height: normal" slot-scope="{ row }">
<p>{{ row.updateTime | timeStampToYmd }}</p>
<p>{{ row.updateTime | timeStampToHms }}</p>
</div>
</el-table-column>
<el-table-column label="操作" min-width="120px" v-if="$getButtonLimit($buttonCode.editShowRules) || $getButtonLimit($buttonCode.delShowRules)">
<template slot-scope="{ row, $index }">
......
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