Commit c90ef415 authored by sixiaofeng's avatar sixiaofeng

添加资产云环境变量

parent 3388bd18
NODE_ENV=production
VUE_APP_QRCODE_URL=http://81.68.145.183:8887
VUE_APP_ENV=orginone
VUE_APP_SHOWCONSOLE=hide
VUE_APP_DOWNLOADPAGE=https://3syxin.com/
\ No newline at end of file
NODE_ENV=production
VUE_APP_ENV=orginone
VUE_APP_QRCODE_URL=http://121.40.18.70:7788/oa
\ No newline at end of file
...@@ -6,6 +6,7 @@ node_modules ...@@ -6,6 +6,7 @@ node_modules
/oa /oa
/oa.zip /oa.zip
/zip /zip
/orginone
# local env files # local env files
.env.local .env.local
......
...@@ -6,9 +6,12 @@ ...@@ -6,9 +6,12 @@
"serve": "vue-cli-service serve", "serve": "vue-cli-service serve",
"serve:people": "vue-cli-service serve --mode testpeople", "serve:people": "vue-cli-service serve --mode testpeople",
"serve:police": "vue-cli-service serve --mode testpolice", "serve:police": "vue-cli-service serve --mode testpolice",
"serve:orginone": "vue-cli-service serve --mode testorginone",
"build": "vue-cli-service build", "build": "vue-cli-service build",
"build:police": "vue-cli-service build --mode police", "build:police": "vue-cli-service build --mode police",
"build:people": "vue-cli-service build --mode people", "build:people": "vue-cli-service build --mode people",
"build:orginone": "vue-cli-service build --mode orginone",
"build:testorginone": "vue-cli-service build --mode testorginone",
"deploy": "npm run build && bash deploy.sh", "deploy": "npm run build && bash deploy.sh",
"deploy:people": "vue-cli-service build --mode testpeople && bash deploy.sh", "deploy:people": "vue-cli-service build --mode testpeople && bash deploy.sh",
"lint": "vue-cli-service lint --fix" "lint": "vue-cli-service lint --fix"
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover"> <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover">
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <link rel="icon" href="<%= BASE_URL %>favicon.ico">
<script src="//at.alicdn.com/t/font_2807159_s39q40uhhls.js"></script>
<title><%= htmlWebpackPlugin.options.title %></title> <title><%= htmlWebpackPlugin.options.title %></title>
</head> </head>
<body> <body>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="title flex-shrink-0 mr-4">{{ title }}</div> <div class="title flex-shrink-0 mr-4">{{ title }}</div>
</div> </div>
<van-switch <van-switch
:active-color="primaryColor" :active-color="primaryInfo.color"
:value="checked" :value="checked"
size="20px" size="20px"
@change="change" @change="change"
......
!function(a){var t,h,l,e,c,o='<svg><symbol id="icon-minus-2" viewBox="0 0 1024 1024"><path d="M512 0c282.76736 0 512 229.23264 512 512S794.76736 1024 512 1024 0 794.76736 0 512 229.23264 0 512 0z m204.8 443.74016H307.2a68.25984 68.25984 0 1 0 0 136.51968h409.6a68.25984 68.25984 0 1 0 0-136.51968z" ></path></symbol><symbol id="icon-minus" viewBox="0 0 1024 1024"><path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z" ></path><path d="M238.94016 443.74016m68.25984 0l409.62048 0q68.25984 0 68.25984 68.25984l0 0.02048q0 68.25984-68.25984 68.25984l-409.62048 0q-68.25984 0-68.25984-68.25984l0-0.02048q0-68.25984 68.25984-68.25984Z" ></path></symbol><symbol id="icon-correct" viewBox="0 0 1385 1024"><path d="M1287.830588 0L1385.411765 92.943059 508.988235 1024 0 475.738353l98.183529-92.340706 411.407059 443.211294z" ></path></symbol><symbol id="icon-home" viewBox="0 0 1024 1024"><path d="M586.509474 44.328421l399.683368 382.302316A80.842105 80.842105 0 0 1 943.157895 564.870737V916.210526a107.789474 107.789474 0 0 1-107.789474 107.789474h-242.526316V754.526316a26.947368 26.947368 0 0 0-23.794526-26.758737L565.894737 727.578947h-80.842105a26.947368 26.947368 0 0 0-26.758737 23.794527L458.105263 754.526316v269.473684H188.631579a107.789474 107.789474 0 0 1-107.789474-107.789474V564.870737a80.842105 80.842105 0 0 1-43.034947-138.24L437.490526 44.328421a107.789474 107.789474 0 0 1 149.018948 0zM512 122.206316L151.498105 466.997895 188.631579 472.926316V916.210526h161.68421v-164.783158l0.538948-9.377684 0.350316-3.098947a134.736842 134.736842 0 0 1 127.838315-119.026526L485.052632 619.789474h83.941052l9.377684 0.538947 3.098948 0.350316a134.736842 134.736842 0 0 1 119.026526 127.838316L700.631579 754.526316l-0.053895 161.68421H835.368421V473.034105l37.133474-5.982316L512 122.206316z" ></path><path d="M215.578947 404.210526v512H80.842105V404.210526zM943.157895 404.210526v512h-134.736842V404.210526z" ></path></symbol><symbol id="icon-frame" viewBox="0 0 1184 1024"><path d="M498.26826 0h141.062248a74.958535 74.958535 0 0 1 74.989281 74.958535v142.568797a74.958535 74.958535 0 0 1-74.989281 74.989281h-141.062248a74.958535 74.958535 0 0 1-74.98928-74.989281V74.958535A74.958535 74.958535 0 0 1 498.26826 0zM498.26826 691.352592h141.062248a74.958535 74.958535 0 0 1 74.989281 74.989281v142.568797A74.958535 74.958535 0 0 1 639.330508 983.869205h-141.062248a74.958535 74.958535 0 0 1-74.98928-74.958535v-142.568797a74.958535 74.958535 0 0 1 74.98928-74.989281z" ></path><path d="M0 691.352592m74.958535 0l141.092993 0q74.958535 0 74.958535 74.958535l0 142.599543q0 74.958535-74.958535 74.958535l-141.092993 0q-74.958535 0-74.958535-74.958535l0-142.599543q0-74.958535 74.958535-74.958535Z" ></path><path d="M846.588705 691.352592m74.958535 0l141.092993 0q74.958535 0 74.958535 74.958535l0 142.599543q0 74.958535-74.958535 74.958535l-141.092993 0q-74.958535 0-74.958535-74.958535l0-142.599543q0-74.958535 74.958535-74.958535Z" ></path><path d="M982.208926 442.525921c21.030204 0 38.094186 17.063982 38.094185 38.094186v230.163902a38.124932 38.124932 0 1 1-76.219117 0v-191.67002H601.144084v210.824723a38.124932 38.124932 0 1 1-76.188371 0v-210.824723H182.015803v191.67002a38.124932 38.124932 0 1 1-76.188372 0v-230.163902c0-21.030204 17.063982-38.124932 38.124932-38.124932h381.00335V250.825155a38.124932 38.124932 0 1 1 76.219117 0l-0.030746 191.67002h381.064842z" ></path></symbol><symbol id="icon-grow" viewBox="0 0 1877 1024"><path d="M1877.333333 0v512h-157.297777l-0.056889-183.182222L1094.087111 1024l-482.702222-467.797333L111.502222 965.404444 0 851.456 621.226667 343.04l464.270222 449.820444 524.288-582.200888-218.965333 37.319111L1365.333333 87.153778 1877.333333 0z" ></path></symbol><symbol id="icon-edit" viewBox="0 0 1024 1024"><path d="M748.43978 896.001393h231.120309c24.545615 0 44.453163 19.09438 44.453163 42.676241v42.646125c0 23.581861-19.877431 42.676241-44.453163 42.676241h-231.090191c-24.545615 0-44.453163-19.09438-44.453164-42.676241v-42.646125c0-23.581861 19.877431-42.676241 44.453164-42.676241z m-351.981111 0h231.120309c24.545615 0 44.453163 19.09438 44.453163 42.676241v42.646125c0 23.581861-19.907548 42.676241-44.453163 42.676241h-231.120309c-24.545615 0-44.453163-19.09438-44.453163-42.676241v-42.646125c0-23.581861 19.907548-42.676241 44.453163-42.676241z m-351.98111 0h231.090191c24.545615 0 44.453163 19.09438 44.453163 42.676241v42.646125c0 23.581861-19.877431 42.676241-44.453163 42.676241H44.477559C19.901826 1024 0.024395 1004.90562 0.024395 981.323759v-42.646125c0-23.581861 19.877431-42.676241 44.453164-42.676241z m627.554582-556.929469L200.665977 819.051642a43.70023 43.70023 0 0 1-37.405711 12.498688l-137.636149-19.817197-24.907023-134.47383c-2.529855-13.522676 1.716687-27.406761 11.444581-37.285242l471.336047-479.9496 188.504302 179.047463z m82.069695-115.04816l-178.083709-174.559982 22.889163-24.063738c15.05866-15.84171 35.719141-24.997375 57.433728-25.388901a81.136058 81.136058 0 0 1 58.277013 23.310806l60.415342 59.270884c15.600771 15.299598 24.575733 36.231135 24.997375 58.246896a83.69603 83.69603 0 0 1-22.949397 59.09018l-22.889163 24.093855h-0.090352z" ></path></symbol><symbol id="icon-plus" viewBox="0 0 1024 1024"><path d="M177.230769 472.615385m39.384616 0l590.76923 0q39.384615 0 39.384616 39.384615l0 0q0 39.384615-39.384616 39.384615l-590.76923 0q-39.384615 0-39.384616-39.384615l0 0q0-39.384615 39.384616-39.384615Z" ></path><path d="M551.384615 177.230769m0 39.384616l0 590.76923q0 39.384615-39.384615 39.384616l0 0q-39.384615 0-39.384615-39.384616l0-590.76923q0-39.384615 39.384615-39.384616l0 0q39.384615 0 39.384615 39.384616Z" ></path></symbol><symbol id="icon-radio" viewBox="0 0 1024 1024"><path d="" ></path></symbol><symbol id="icon-ssyx" viewBox="0 0 1024 1024"><path d="M0 0h1024v1024H0z" fill="#FFFFFF" ></path><path d="M847.0016 746.3936c4.9664 0 9.096533 3.6352 9.864533 8.362667l0.136534 1.6384v110.677333l-0.136534 1.621333a10.001067 10.001067 0 0 1-8.2432 8.2432l-1.621333 0.136534h-111.479467l-69.0688 29.866666a10.001067 10.001067 0 0 1-13.824-7.543466l-0.136533-1.621334V756.394667c0-4.9664 3.618133-9.096533 8.362667-9.864534l1.6384-0.136533h184.490666zM238.848 535.995733c5.512533 0 10.001067 4.488533 10.001067 10.001067v13.3632l212.138666 0.017067c5.5296 0 10.018133 4.471467 10.018134 10.001066v26.760534a10.001067 10.001067 0 0 1-10.001067 10.001066H248.832v17.527467h153.7024l1.2288 0.085333a10.103467 10.103467 0 0 1 1.2288-0.085333H431.786667c5.5296 0 10.001067 4.488533 10.001066 10.001067v231.338666a10.001067 10.001067 0 0 1-8.379733 9.864534l-1.621333 0.136533h-44.305067a10.001067 10.001067 0 0 1-10.001067-10.001067v-26.760533c0-5.5296 4.471467-10.001067 10.001067-10.001067h7.5264v-157.832533H248.832v17.544533h118.613333c5.546667 0 10.018133 4.488533 10.018134 10.001067v26.760533a10.001067 10.001067 0 0 1-10.001067 10.001067h-118.613333v17.527467h118.613333c5.5296 0 10.001067 4.488533 10.001067 10.018133v26.743467a10.001067 10.001067 0 0 1-10.001067 10.001066h-118.613333v65.9968a10.001067 10.001067 0 0 1-10.001067 10.001067h-26.7776a10.001067 10.001067 0 0 1-10.001067-10.001067V606.122667h-25.070933a10.001067 10.001067 0 0 1-10.001067-9.984v-26.760534c0-5.5296 4.471467-10.001067 10.001067-10.001066h25.088v-13.380267c0-5.512533 4.471467-10.001067 9.984-10.001067h26.7776z m380.2624 17.544534c5.5296 0 10.001067 4.471467 10.001067 10.001066v301.431467a10.001067 10.001067 0 0 1-10.001067 10.001067H592.384a10.001067 10.001067 0 0 1-10.001067-10.001067v-264.704l-27.0848 0.017067a10.001067 10.001067 0 0 1-10.001066-10.001067V563.541333c0-5.5296 4.471467-10.001067 10.001066-10.001066h63.829334z m185.1392 239.616h-99.0208c-2.901333 0-5.307733 2.048-5.870933 4.778666l-0.119467 1.211734v39.150933a3.9936 3.9936 0 0 0 4.864 3.908267l1.006933-0.375467 21.742934-11.52h77.397333c2.901333 0 5.3248-2.048 5.888-4.778667l0.119467-1.211733v-25.173333a6.007467 6.007467 0 0 0-6.007467-5.9904z m42.752-111.0528c5.5296 0 10.001067 4.488533 10.001067 10.001066v26.760534a10.001067 10.001067 0 0 1-10.001067 10.001066H662.493867a10.001067 10.001067 0 0 1-10.001067-10.001066v-26.760534c0-5.512533 4.471467-10.001067 10.001067-10.001066h184.490666z m-19.165867-60.433067c5.512533 0 9.984 4.471467 9.984 10.001067v26.743466a10.001067 10.001067 0 0 1-9.984 10.001067H681.642667a10.001067 10.001067 0 0 1-10.001067-10.001067v-26.743466c0-5.5296 4.488533-10.001067 10.001067-10.001067h146.176z m-56.797866-85.674667c5.5296 0 10.001067 4.488533 10.001066 10.001067v13.3632l65.962667 0.017067c5.5296 0 10.001067 4.471467 10.001067 10.001066v26.760534a10.001067 10.001067 0 0 1-10.001067 10.001066H662.493867a10.001067 10.001067 0 0 1-10.001067-10.001066v-26.760534c0-5.5296 4.471467-10.001067 10.001067-10.001066h71.799466v-13.380267c0-5.512533 4.471467-10.001067 10.001067-10.001067h26.743467z m-52.053334-401.988266c5.546667 0 10.018133 4.471467 10.018134 9.984l-0.017067 48.008533h106.018133c5.512533 0 10.001067 4.471467 10.001067 10.001067v26.999466a10.001067 10.001067 0 0 1-10.001067 10.001067h-106.018133v57.992533h89.019733c5.512533 0 10.001067 4.488533 10.001067 10.001067v26.999467a10.001067 10.001067 0 0 1-10.001067 10.001066h-89.019733v70.007467h118.016c5.5296 0 10.001067 4.471467 10.001067 10.001067v26.999466a10.001067 10.001067 0 0 1-10.001067 10.001067h-278.016a10.001067 10.001067 0 0 1-9.984-10.001067v-26.999466c0-5.5296 4.471467-10.001067 10.001067-10.001067h112.981333v-70.007467h-88.9856a10.001067 10.001067 0 0 1-10.001067-10.001066v-26.999467c0-5.512533 4.471467-10.001067 10.001067-10.001067h89.002667v-57.992533h-107.008a10.001067 10.001067 0 0 1-10.001067-10.001067V166.997333c0-5.512533 4.488533-10.001067 10.001067-10.001066h26.999466c5.5296 0 10.001067 4.488533 10.001067 10.001066v25.002667h70.007467V143.991467c0-5.512533 4.471467-9.984 10.001066-9.984h26.999467zM461.021867 414.0032c5.512533 0 10.001067 4.471467 10.001066 10.001067v26.999466a10.001067 10.001067 0 0 1-10.001066 10.001067h-283.989334a10.001067 10.001067 0 0 1-10.018133-10.001067v-26.999466c0-5.5296 4.471467-10.001067 10.001067-10.001067h283.989333z m-23.005867-129.006933c5.5296 0 10.001067 4.488533 10.001067 10.001066v26.999467a10.001067 10.001067 0 0 1-10.001067 10.001067H200.994133a10.001067 10.001067 0 0 1-10.001066-10.001067v-26.999467c0-5.512533 4.488533-10.001067 10.001066-10.001066h237.0048z m23.005867-128c5.512533 0 10.001067 4.488533 10.001066 10.001066v26.999467a10.001067 10.001067 0 0 1-10.001066 10.001067h-283.989334a10.001067 10.001067 0 0 1-10.018133-10.001067V166.997333c0-5.512533 4.471467-10.001067 10.001067-10.001066h283.989333z" fill="#32B2F7" ></path></symbol><symbol id="icon-radio-checked" viewBox="0 0 1024 1024"><path d="M431.104 598.084267l283.101867-283.101867a57.685333 57.685333 0 0 1 81.7152 0.170667c22.596267 22.596267 22.596267 59.255467 0.170666 81.7152l-320.7168 320.682666c-10.581333 10.615467-24.302933 16.247467-38.229333 16.861867-16.725333 1.9456-34.133333-3.447467-46.728533-16.042667l-162.577067-162.6112a56.661333 56.661333 0 0 1 0.1024-80.349866 57.070933 57.070933 0 0 1 80.349867-0.1024l122.7776 122.7776zM512 1024c282.760533 0 512-229.239467 512-512 0-282.760533-229.239467-512-512-512C229.239467 0 0 229.239467 0 512c0 282.760533 229.239467 512 512 512z" ></path></symbol><symbol id="icon-dot" viewBox="0 0 1024 1024"><path d="M512 102.4m-102.4 0a102.4 102.4 0 1 0 204.8 0 102.4 102.4 0 1 0-204.8 0Z" ></path><path d="M512 512m-102.4 0a102.4 102.4 0 1 0 204.8 0 102.4 102.4 0 1 0-204.8 0Z" ></path><path d="M512 921.6m-102.4 0a102.4 102.4 0 1 0 204.8 0 102.4 102.4 0 1 0-204.8 0Z" ></path></symbol><symbol id="icon-tree" viewBox="0 0 1024 1024"><path d="M625.777778 0a56.888889 56.888889 0 0 1 56.888889 56.888889v142.222222a56.888889 56.888889 0 0 1-56.888889 56.888889H170.666667v256h284.444444v-28.444444a56.888889 56.888889 0 0 1 56.888889-56.888889h455.111111a56.888889 56.888889 0 0 1 56.888889 56.888889v113.777777a56.888889 56.888889 0 0 1-56.888889 56.888889H512a56.888889 56.888889 0 0 1-56.888889-56.888889v-28.444444H170.666667v312.860444L455.111111 881.777778v-28.444445a56.888889 56.888889 0 0 1 56.888889-56.888889h455.111111a56.888889 56.888889 0 0 1 56.888889 56.888889v113.777778a56.888889 56.888889 0 0 1-56.888889 56.888889H512a56.888889 56.888889 0 0 1-56.888889-56.888889v-28.444444H142.222222a28.444444 28.444444 0 0 1-28.444444-28.444445V256H56.888889a56.888889 56.888889 0 0 1-56.888889-56.888889V56.888889a56.888889 56.888889 0 0 1 56.888889-56.888889h568.888889z" ></path></symbol><symbol id="icon-search" viewBox="0 0 1024 1024"><path d="M512 768c-163.131077 0-295.384615-132.253538-295.384615-295.384615 0-163.131077 132.253538-295.384615 295.384615-295.384616 163.131077 0 295.384615 132.253538 295.384615 295.384616 0 163.131077-132.253538 295.384615-295.384615 295.384615z m0-78.769231c119.630769 0 216.615385-96.984615 216.615385-216.615384s-96.984615-216.615385-216.615385-216.615385-216.615385 96.984615-216.615385 216.615385 96.984615 216.615385 216.615385 216.615384z" ></path><path d="M689.237845 744.936102m27.849129-27.849128l0 0q27.849129-27.849129 55.698257 0l55.698257 55.698257q27.849129 27.849129 0 55.698257l0 0q-27.849129 27.849129-55.698257 0l-55.698257-55.698257q-27.849129-27.849129 0-55.698257Z" ></path></symbol><symbol id="icon-dot-h" viewBox="0 0 1024 1024"><path d="M128.00000001 512m-1e-8 96a96 96 0 1 0 0-192 96 96 0 1 0 0 192Z" ></path><path d="M512 512m0 96a96 96 0 1 0 0-192 96 96 0 1 0 0 192Z" ></path><path d="M895.99999999 512m1e-8 96a96 96 0 1 0 0-192 96 96 0 1 0 0 192Z" ></path></symbol><symbol id="icon-left-arrow" viewBox="0 0 1024 1024"><path d="M183.04 529.998769c1.654154 2.835692 2.855385 5.868308 5.395692 8.388923 0.551385 0.433231 0.984615 0.748308 1.417846 1.181539 0.649846 0.551385 0.886154 1.417846 1.437539 1.969231L498.412308 835.032615c8.113231 7.817846 18.648615 11.736615 29.184 11.736616 10.968615 0 22.055385-4.332308 30.286769-12.839385a41.491692 41.491692 0 0 0-1.102769-59.037538L279.709538 510.227692 557.883077 249.324308a41.511385 41.511385 0 0 0 1.634461-59.037539 42.397538 42.397538 0 0 0-59.56923-1.634461L189.971692 479.310769c-13.587692 12.721231-16.147692 32.295385-8.467692 48.167385 0.334769 0.866462 1.102769 1.634462 1.555692 2.500923z" ></path></symbol></svg>',i=(i=document.getElementsByTagName("script"))[i.length-1].getAttribute("data-injectcss"),v=function(a,t){t.parentNode.insertBefore(a,t)};if(i&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(a){console&&console.log(a)}}function d(){c||(c=!0,l())}function n(){try{e.documentElement.doScroll("left")}catch(a){return void setTimeout(n,50)}d()}t=function(){var a,t;(t=document.createElement("div")).innerHTML=o,o=null,(a=t.getElementsByTagName("svg")[0])&&(a.setAttribute("aria-hidden","true"),a.style.position="absolute",a.style.width=0,a.style.height=0,a.style.overflow="hidden",t=a,(a=document.body).firstChild?v(t,a.firstChild):a.appendChild(t))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(t,0):(h=function(){document.removeEventListener("DOMContentLoaded",h,!1),t()},document.addEventListener("DOMContentLoaded",h,!1)):document.attachEvent&&(l=t,e=a.document,c=!1,n(),e.onreadystatechange=function(){"complete"==e.readyState&&(e.onreadystatechange=null,d())})}(window);
\ No newline at end of file
...@@ -12,6 +12,7 @@ import dsbridge from 'dsbridge' ...@@ -12,6 +12,7 @@ import dsbridge from 'dsbridge'
import { Dialog, Toast, Notify } from 'vant' import { Dialog, Toast, Notify } from 'vant'
import VConsole from 'vconsole' import VConsole from 'vconsole'
import mixins from './mixins'; import mixins from './mixins';
import './iconfont.js';
Vue.config.productionTip = false Vue.config.productionTip = false
Vue.use(Dialog).use(Toast).use(Notify) Vue.use(Dialog).use(Toast).use(Notify)
......
...@@ -3,14 +3,58 @@ const mixins = { ...@@ -3,14 +3,58 @@ const mixins = {
return{}; return{};
}, },
computed:{ computed:{
primaryColor() { primaryInfo() {
const appEnv = process.env.VUE_APP_ENV const appEnv = process.env.VUE_APP_ENV
if (appEnv === 'people') { if (appEnv === 'people') {
return '#32b2f7' return {
color: '#32b2f7',
qrCodeBg: require('@/assets/qrbackground-people.png'),
logoSrc: require('@/assets/icons/txmz.png'),
avator: require('@/assets/icons/avator.png'),
teamAvator: require('@/assets/icons/team-icon.png')
}
} else if (appEnv === 'police') {
return {
color: '#4f62c1',
qrCodeBg: require('@/assets/qrbackground.png'),
logoSrc: require('@/assets/icons/txga.png'),
avator: require('@/assets/icons/avator.png'),
teamAvator: require('@/assets/icons/team-icon.png')
}
} else if (appEnv === 'orginone') {
return {
color: '#0131E5',
qrCodeBg: require('@/assets/qrbackground-orginone.png'),
logoSrc: require('@/assets/icons/orginone.png'),
avator: require('@/assets/icons/avator-orginone.png'),
teamAvator: require('@/assets/icons/team-icon-orginone.png')
}
} else { } else {
return '#4f62c1' return {
color: '#32b2f7',
qrCodeBg: require('@/assets/qrbackground-people.png'),
logoSrc: require('@/assets/icons/txmz.png'),
avator: require('@/assets/icons/avator.png'),
teamAvator: require('@/assets/icons/team-icon.png')
}
} }
} },
// qrCodeBg() {
// const env = process.env.VUE_APP_ENV
// if (env === 'people') {
// return require('@/assets/qrbackground-people.png')
// } else {
// return require('@/assets/qrbackground.png')
// }
// },
// logoSrc() {
// const env = process.env.VUE_APP_ENV
// if (env === 'people') {
// return require('@/assets/icons/txmz.png')
// } else {
// return require('@/assets/icons/txga.png')
// }
// }
} }
} }
......
...@@ -38,14 +38,14 @@ body { ...@@ -38,14 +38,14 @@ body {
&__header { &__header {
text-align: center; text-align: center;
font-size: 14px; font-size: 14px;
color: #8A97A5; // color: #8A97A5;
height: 60px; height: 60px;
padding: 0; padding: 0;
line-height: 60px; line-height: 60px;
} }
&__content, &__content,
&__message { &__message {
color: #24374E; // color: #24374E;
font-size: 16px; font-size: 16px;
text-align: center; text-align: center;
} }
...@@ -56,7 +56,7 @@ body { ...@@ -56,7 +56,7 @@ body {
padding: 0; padding: 0;
} }
.van-button { .van-button {
color: #32B2F7; // color: #32B2F7;
height: 48px; height: 48px;
} }
} }
\ No newline at end of file
...@@ -125,7 +125,7 @@ export default Vue.extend({ ...@@ -125,7 +125,7 @@ export default Vue.extend({
} }
this.$dialog.confirm({ this.$dialog.confirm({
title: '提示', title: '提示',
message: '确定要删除选中的成员吗?' message: '确定要删除选中的成员吗?',
// confirmButtonText: '解散' // confirmButtonText: '解散'
}).then(() => { }).then(() => {
this.selected.forEach(id => { this.selected.forEach(id => {
......
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
<van-calendar <van-calendar
v-model="show" v-model="show"
:round="false" :round="false"
:color="primaryColor" :color="primaryInfo.color"
:show-confirm="true" :show-confirm="true"
:style="{ height: '100%' }" :style="{ height: '100%' }"
:min-date="new Date(1981,1,1)" :min-date="new Date(1981,1,1)"
......
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
<van-calendar <van-calendar
v-model="showCalendar" v-model="showCalendar"
:round="false" :round="false"
:color="primaryColor" :color="primaryInfo.color"
:show-confirm="true" :show-confirm="true"
:style="{ height: '100%' }" :style="{ height: '100%' }"
:min-date="new Date(1971,1,1)" :min-date="new Date(1971,1,1)"
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="flex items-center py-2 border border-transparent w-full" @click="handleClick(member)"> <div class="flex items-center py-2 border border-transparent w-full" @click="handleClick(member)">
<app-icon <app-icon
type="png" type="png"
:path="require('@/assets/icons/avator.png')" :path="primaryInfo.avator"
class-name="w-9 h-9" class-name="w-9 h-9"
/> />
<div class="ml-3">{{ member.name }}</div> <div class="ml-3">{{ member.name }}</div>
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
type="svg" type="svg"
name="icon-radio-checked" name="icon-radio-checked"
size="16px" size="16px"
:color="primaryColor" :color="primaryInfo.color"
/> />
</div> </div>
<div v-show="!showChecked(t)" class="h-4 w-4 border border-color-primary rounded-full"></div> <div v-show="!showChecked(t)" class="h-4 w-4 border border-color-primary rounded-full"></div>
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
type="svg" type="svg"
name="icon-tree" name="icon-tree"
size="20px" size="20px"
:color="primaryColor" :color="primaryInfo.color"
/> />
<span class="ml-2.5">下一级</span> <span class="ml-2.5">下一级</span>
</div> </div>
......
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
<div v-show="!dataUrl" id="qrCodeWrapper" class="qrcode mt-2 relative w-72 h-113.5 mx-auto"> <div v-show="!dataUrl" id="qrCodeWrapper" class="qrcode mt-2 relative w-72 h-113.5 mx-auto">
<p class=" text-white absolute top-24 text-base left-0 right-0 mx-auto text-center">{{ entInfo.name }}</p> <p class=" text-white absolute top-24 text-base left-0 right-0 mx-auto text-center">{{ entInfo.name }}</p>
<p class=" text-white absolute top-32 text-sm left-0 right-0 mx-auto text-center">团队号:{{ entInfo.id }}</p> <p class=" text-white absolute top-32 text-sm left-0 right-0 mx-auto text-center">团队号:{{ entInfo.id }}</p>
<img ref="wrapper" :src="qrCodeBg" alt="" class=""> <img ref="wrapper" :src="primaryInfo.qrCodeBg" alt="" class="">
<div class="absolute w-36 mt-2 top-40 left-0 right-0 mx-auto "> <div class="absolute w-36 mt-2 top-40 left-0 right-0 mx-auto ">
<vue-qr <vue-qr
:logo-src="logoSrc" :logo-src="primaryInfo.logoSrc"
:logo-margin="4" :logo-margin="4"
:logo-scale="0.15" :logo-scale="0.15"
:text="text" :text="text"
...@@ -57,24 +57,24 @@ export default Vue.extend({ ...@@ -57,24 +57,24 @@ export default Vue.extend({
dataUrl: '' dataUrl: ''
} }
}, },
computed: { // computed: {
qrCodeBg() { // qrCodeBg() {
const env = process.env.VUE_APP_ENV // const env = process.env.VUE_APP_ENV
if (env === 'people') { // if (env === 'people') {
return require('@/assets/qrbackground-people.png') // return require('@/assets/qrbackground-people.png')
} else { // } else {
return require('@/assets/qrbackground.png') // return require('@/assets/qrbackground.png')
} // }
}, // },
logoSrc() { // logoSrc() {
const env = process.env.VUE_APP_ENV // const env = process.env.VUE_APP_ENV
if (env === 'people') { // if (env === 'people') {
return require('@/assets/icons/txmz.png') // return require('@/assets/icons/txmz.png')
} else { // } else {
return require('@/assets/icons/txga.png') // return require('@/assets/icons/txga.png')
} // }
} // }
}, // },
methods: { methods: {
isIOSMobile, isIOSMobile,
async saveQrCode() { async saveQrCode() {
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
type="svg" type="svg"
name="icon-radio-checked" name="icon-radio-checked"
size="16px" size="16px"
:color="primaryColor" :color="primaryInfo.color"
/> />
</div> </div>
<div v-else class="h-4 w-4 rounded-full border border-primary"></div> <div v-else class="h-4 w-4 rounded-full border border-primary"></div>
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
type="svg" type="svg"
name="icon-radio-checked" name="icon-radio-checked"
size="16px" size="16px"
:color="primaryColor" :color="primaryInfo.color"
/> />
</div> </div>
<div v-else class="h-4 w-4 rounded-full border border-primary"></div> <div v-else class="h-4 w-4 rounded-full border border-primary"></div>
......
...@@ -72,7 +72,12 @@ export default Vue.extend({ ...@@ -72,7 +72,12 @@ export default Vue.extend({
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
url = window.location.origin + '/team/join-team' url = window.location.origin + '/team/join-team'
} else { } else {
url = process.env.VUE_APP_QRCODE_URL + '/team/join-team' if (process.env.VUE_APP_ENV === 'orginone') {
url = window.location.origin + '/oa/team/join-team'
} else {
url = process.env.VUE_APP_QRCODE_URL + '/team/join-team'
}
} }
console.log(process.env.VUE_APP_QRCODE_URL, url, 'url') console.log(process.env.VUE_APP_QRCODE_URL, url, 'url')
this.qrCodeText = `${url}?entId=${encodeURIComponent(this.entId)}` this.qrCodeText = `${url}?entId=${encodeURIComponent(this.entId)}`
......
...@@ -250,7 +250,7 @@ export default Vue.extend({ ...@@ -250,7 +250,7 @@ export default Vue.extend({
deleteDep() { deleteDep() {
this.$dialog.confirm({ this.$dialog.confirm({
title: '提示', title: '提示',
message: '确定删除该部门吗?若该部门有子部门、部门群,则子部门和对应群消息、群文件都会删除!' message: '确定删除该部门吗?若该部门有子部门、部门群,则子部门和对应群消息、群文件都会删除!',
// confirmButtonText: '解散' // confirmButtonText: '解散'
}).then(() => { }).then(() => {
const data = { const data = {
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<!-- logo --> <!-- logo -->
<div class="absolute top-20 left-1/2 border transform -translate-x-1/2 z-10 w-15 h-15 bg-white rounded-full overflow-hidden flex items-center justify-center"> <div class="absolute top-20 left-1/2 border transform -translate-x-1/2 z-10 w-15 h-15 bg-white rounded-full overflow-hidden flex items-center justify-center">
<img v-if="entInfo.avatar" :src="entInfo.avatar" alt=""> <img v-if="entInfo.avatar" :src="entInfo.avatar" alt="">
<img v-else src="@/assets/icons/team-icon.png" alt="" class="max-w-full"> <img v-else :src="primaryInfo.teamAvator" alt="" class="max-w-full">
</div> </div>
<div class="top-28 px-4 w-full absolute top-10"> <div class="top-28 px-4 w-full absolute top-10">
<div class="bg-white w-full rounded pt-8 pb-4 flex flex-col items-center shadow-bg"> <div class="bg-white w-full rounded pt-8 pb-4 flex flex-col items-center shadow-bg">
......
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
type="svg" type="svg"
name="icon-tree" name="icon-tree"
size="20px" size="20px"
:color="primaryColor" :color="primaryInfo.color"
class-name="mr-2.5" class-name="mr-2.5"
/> />
下一级 下一级
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<div v-else class=""> <div v-else class="">
<app-icon <app-icon
type="png" type="png"
:path="require('@/assets/icons/team-icon.png')" :path="primaryInfo.teamAvator"
class-name="h-13 w-13" class-name="h-13 w-13"
/> />
</div> </div>
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
/> --> /> -->
<div class="w-32 h-32"> <div class="w-32 h-32">
<vue-qr <vue-qr
:logoSrc="require('@/assets/icons/js.png')" :logoSrc="primayInfo.logoSrc"
:text="qrCodeText" :text="qrCodeText"
:margin="2" :margin="2"
:size="400" :size="400"
......
...@@ -6,11 +6,17 @@ const env = process.env.VUE_APP_ENV ...@@ -6,11 +6,17 @@ const env = process.env.VUE_APP_ENV
if (env === 'police') { if (env === 'police') {
primaryColor = '#4F62C1' primaryColor = '#4F62C1'
primaryColorLight = '#CFE1FB'
primaryColorLighter = '#EFF5FE'
} else if (env === 'people') { } else if (env === 'people') {
primaryColor = '#32b2f7' primaryColor = '#32b2f7'
primaryColorLight = '#D5DCFF'
primaryColorLighter = '#61C7FF'
// primaryColor = '#4F62C1' // primaryColor = '#4F62C1'
} else { } else {
primaryColor = '#4F62C1' primaryColor = '#0131E5'
primaryColorLight = '#D6DFFF'
primaryColorLighter = '#F0F3FF'
} }
module.exports = { module.exports = {
...@@ -22,8 +28,8 @@ module.exports = { ...@@ -22,8 +28,8 @@ module.exports = {
colors: { colors: {
'common-bg': '#F6F7F8', 'common-bg': '#F6F7F8',
'color-primary': primaryColor, 'color-primary': primaryColor,
'color-primary-light': '#D5DCFF', 'color-primary-light': primaryColorLight,
'color-primary-lighter': '#61C7FF', 'color-primary-lighter': primaryColorLighter,
'text-primary': '#24374E', 'text-primary': '#24374E',
'text-primary-dark': '#0D73AD', 'text-primary-dark': '#0D73AD',
'text-secondary': '#8A97A5', 'text-secondary': '#8A97A5',
......
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