Commit 1f176eee authored by sixiaofeng's avatar sixiaofeng

1

parent 43d7e260
NODE_ENV=production
VUE_APP_QRCODE_URL=http://218.75.123.183:13809/oa
VUE_APP_QRCODE_URL=https://orginone-chat.assetcloud.org.cn/oa
VUE_APP_ENV=orginone
VUE_APP_SHOWCONSOLE=hide
VUE_APP_DOWNLOADPAGE=http://218.75.123.183:13809
\ No newline at end of file
VUE_APP_DOWNLOADPAGE=https://orginone-chat.assetcloud.org.cn/
\ No newline at end of file
......@@ -30,9 +30,10 @@
class="flex items-center py-2"
>
<app-icon
icon-name="avator"
class-name="h-9 w-9 flex-shrink-0"
></app-icon>
type="png"
:path="primaryInfo.avator"
class-name="w-9 h-9 flex-shrink-0"
/>
<div class="name truncate ml-3">{{l.name}}</div>
</div>
</div>
......@@ -55,9 +56,10 @@
class="flex items-center py-2"
>
<app-icon
icon-name="avator"
class-name="h-9 w-9 flex-shrink-0"
></app-icon>
type="png"
:path="primaryInfo.avator"
class-name="w-9 h-9 flex-shrink-0"
/>
<div class="name truncate mx-3">{{ a.name }}</div>
<app-icon
icon-name="minus-round"
......
......@@ -5,9 +5,9 @@
<div class="text-center text-sm text-text-secondary">长按保存二维码</div>
</div>
<div v-show="!dataUrl" id="qrCodeWrapper" class="qrcode 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 w-full truncate px-2 text-base left-0 right-0 mx-auto text-center">{{ entInfo.name }}</p>
<div class="text-white flex items-center justify-center w-full absolute top-32 text-sm left-0 right-0 px-2">
<div class="">团队号:{{ entInfo.id }}</div>
<div class="truncate">团队号:{{ entInfo.id }}</div>
<div
id="copyBtn"
class="ml-2"
......@@ -34,7 +34,7 @@
background-color="#fff"
/>
</div>
<p class=" text-white absolute top-82 left-0 right-0 mx-auto text-center text-sm"> 扫描二维码加入我们{{ entInfo.name }}的团队</p>
<p class=" text-white h-12 overflow-y-auto z-50 absolute top-82 left-0 px-2 break-words right-0 mx-auto text-center text-sm"> 扫描二维码加入我们{{ entInfo.name }}的团队</p>
</div>
<div v-show="!dataUrl" class="px-4 z-50 flex items-center justify-center">
<div @click.stop="saveQrCode" class="btn flex flex-col items-center justify-center -mt-1.5">
......
......@@ -4,7 +4,7 @@
<div class="flex">
<!-- 头像 -->
<div class=" mr-2 mt-5">
<img src="@/assets/icons/avator.png" alt="" srcset="" class="w-9 ">
<img :src="primaryInfo.avator" alt="" srcset="" class="w-9 ">
</div>
<!-- 申请详情 -->
<div class=" bg-white rounded-xl w-full">
......
......@@ -151,8 +151,8 @@ export default Vue.extend({
const userInfoDev = {
depId: '168398222891421697',
entId: '168398222891421696',
// id: '1K7cApKbEU9h5WySPVLNgdSd67i2XkSuoS',
id: '1Gwr2QzfHF3CYCYdPKJoEAxfCUimg1cPup',
id: '1K7cApKbEU9h5WySPVLNgdSd67i2XkSuoS',
// id: '1JSSTNLSJS1gctBLUSzbspd6LtmZ5XnAmd',
joinTime: 1631090065,
name: '徐丹',
role: 3
......
......@@ -13,6 +13,11 @@ if (env === 'police') {
primaryColorLight = '#D5DCFF'
primaryColorLighter = '#61C7FF'
// primaryColor = '#4F62C1'
} else if (env === 'orginone') {
primaryColor = '#0131E5'
primaryColorLight = '#D6DFFF'
primaryColorLighter = '#F0F3FF'
// primaryColor = '#4F62C1'
} else {
primaryColor = '#32b2f7'
primaryColorLight = '#D5DCFF'
......
......@@ -21,6 +21,7 @@ module.exports = {
}
}
},
productionSourceMap: false,
devServer: {
proxy: { // 设置代理
'/proxyApi': {
......
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