Update tooltip for preappending country code for mobile verification

This commit is contained in:
jetli 2024-07-25 22:26:32 -07:00
parent bdeed9eff9
commit 7d11ca79e5
6 changed files with 212 additions and 419 deletions

View File

@ -212,5 +212,5 @@ export default {
'Issues management': 'Issues management', 'Issues management': 'Issues management',
'Payment progress': 'Payment progress', 'Payment progress': 'Payment progress',
Goal: 'Goal', Goal: 'Goal',
'Message': 'Message' Message: 'Message'
} }

View File

@ -201,9 +201,9 @@ export default {
'Number of projects fulfilled': '完成项目总数', 'Number of projects fulfilled': '完成项目总数',
'Gross trading value': '完成项目总金额', 'Gross trading value': '完成项目总金额',
'Delivery time per project': '项目平均交付时长', 'Delivery time per project': '项目平均交付时长',
'Logins': '总登录次数', Logins: '总登录次数',
'Issued request': '项目请求总数', 'Issued request': '项目请求总数',
'Open requests': '待处理的项目请求', 'Open requests': '待处理的项目请求',
'Lines of code per week': '每周代码产量', 'Lines of code per week': '每周代码产量',
'Message': '消息' Message: '消息'
} }

View File

@ -7,13 +7,8 @@
<span v-if="accountNeedAttention">!</span> <span v-if="accountNeedAttention">!</span>
</div> </div>
<div class="panel-content-container" id="account-summary"> <div class="panel-content-container" id="account-summary">
<button <button class="panel-item-container" data-bs-toggle="collapse" data-bs-target="#collapse-user-id"
class="panel-item-container" aria-expanded="false" aria-controls="collapse-user-id">
data-bs-toggle="collapse"
data-bs-target="#collapse-user-id"
aria-expanded="false"
aria-controls="collapse-user-id"
>
<div class="profile-item-container"> <div class="profile-item-container">
<label class="profile-item-label" for="account-summary-user-id">{{ <label class="profile-item-label" for="account-summary-user-id">{{
$t('User ID') $t('User ID')
@ -23,13 +18,8 @@
</span> </span>
</div> </div>
</button> </button>
<button <button class="panel-item-container" data-bs-toggle="collapse" data-bs-target="#collapse-password"
class="panel-item-container" aria-expanded="false" aria-controls="collapse-password">
data-bs-toggle="collapse"
data-bs-target="#collapse-password"
aria-expanded="false"
aria-controls="collapse-password"
>
<div class="profile-item-container"> <div class="profile-item-container">
<label class="profile-item-label" for="account-summary-password">{{ <label class="profile-item-label" for="account-summary-password">{{
$t('Password') $t('Password')
@ -37,13 +27,8 @@
<span class="profile-item-span" id="account-summary-password"> ******** </span> <span class="profile-item-span" id="account-summary-password"> ******** </span>
</div> </div>
</button> </button>
<button <button class="panel-item-container" data-bs-toggle="collapse" data-bs-target="#collapse-user-email"
class="panel-item-container" aria-expanded="false" aria-controls="collapse-user-email">
data-bs-toggle="collapse"
data-bs-target="#collapse-user-email"
aria-expanded="false"
aria-controls="collapse-user-email"
>
<div class="profile-item-container"> <div class="profile-item-container">
<label class="profile-item-label" for="account-summary-email">{{ <label class="profile-item-label" for="account-summary-email">{{
$t('Email') $t('Email')
@ -53,13 +38,8 @@
</span> </span>
</div> </div>
</button> </button>
<button <button class="panel-item-container" data-bs-toggle="collapse" data-bs-target="#collapse-user-mobile"
class="panel-item-container" aria-expanded="false" aria-controls="collapse-user-mobile">
data-bs-toggle="collapse"
data-bs-target="#collapse-user-mobile"
aria-expanded="false"
aria-controls="collapse-user-mobile"
>
<div class="profile-item-container"> <div class="profile-item-container">
<label class="profile-item-label" for="account-summary-mobile">{{ <label class="profile-item-label" for="account-summary-mobile">{{
$t('Mobile') $t('Mobile')
@ -71,61 +51,29 @@
</button> </button>
</div> </div>
</div> </div>
<div <div class="collapse collapse-content-container" id="collapse-user-id" aria-labelledby="account-summary"
class="collapse collapse-content-container" data-bs-parent="#account-panel">
id="collapse-user-id"
aria-labelledby="account-summary"
data-bs-parent="#account-panel"
>
<div class="collapse-item-container"> <div class="collapse-item-container">
<div class="collapse-item-input"> <div class="collapse-item-input">
<input <input type="text" v-model="userProfile.account.basic.FLID.identity" readonly="true" v-tooltip
type="text" title="Generated automatically" delay='{"show":"500", "hide":"100"}' />
v-model="userProfile.account.basic.FLID.identity"
readonly="true"
v-tooltip
title="Generated automatically"
delay='{"show":"500", "hide":"100"}'
/>
</div> </div>
</div> </div>
</div> </div>
<div <div class="collapse collapse-content-container" id="collapse-password" aria-labelledby="account-summary"
class="collapse collapse-content-container" data-bs-parent="#account-panel">
id="collapse-password"
aria-labelledby="account-summary"
data-bs-parent="#account-panel"
>
<div class="collapse-item-container"> <div class="collapse-item-container">
<div class="collapse-item-input"> <div class="collapse-item-input">
<input <input type="password" v-model="passwordOperation.password" :placeholder="passwordOperation.placeholder"
type="password" readonly="true" v-tooltip title="Click to edit" delay='{"show":"500", "hide":"100"}'
v-model="passwordOperation.password" @click="edittingPassword($event)" @blur="stopEdittingPassword($event)" @keyup.enter="blurInput($event)" />
:placeholder="passwordOperation.placeholder"
readonly="true"
v-tooltip
title="Click to edit"
delay='{"show":"500", "hide":"100"}'
@click="edittingPassword($event)"
@blur="stopEdittingPassword($event)"
@keyup.enter="blurInput($event)"
/>
<svg-icon icon="msg-enter" class-name="enter-icon" /> <svg-icon icon="msg-enter" class-name="enter-icon" />
</div> </div>
<div class="collapse-item-input"> <div class="collapse-item-input">
<input <input type="password" v-model="passwordOperation.password2" :placeholder="passwordOperation.placeholder2"
type="password" readonly=" true" v-tooltip title="Click to edit" delay='{"show":"500", "hide":"100"}'
v-model="passwordOperation.password2" @click="edittingPassword2($event)" @blur="stopEdittingPassword2($event)" @keyup.enter="blurInput($event)"
:placeholder="passwordOperation.placeholder2" ref="password2Input" />
readonly=" true"
v-tooltip
title="Click to edit"
delay='{"show":"500", "hide":"100"}'
@click="edittingPassword2($event)"
@blur="stopEdittingPassword2($event)"
@keyup.enter="blurInput($event)"
ref="password2Input"
/>
<svg-icon icon="msg-enter" class-name="enter-icon" /> <svg-icon icon="msg-enter" class-name="enter-icon" />
<p v-if="passwordOperation.message" class="error-message"> <p v-if="passwordOperation.message" class="error-message">
{{ passwordOperation.message }} {{ passwordOperation.message }}
@ -133,104 +81,51 @@
</div> </div>
</div> </div>
</div> </div>
<div <div class="collapse collapse-content-container" id="collapse-user-email" aria-labelledby="account-summary"
class="collapse collapse-content-container" data-bs-parent="#account-panel">
id="collapse-user-email"
aria-labelledby="account-summary"
data-bs-parent="#account-panel"
>
<div class="collapse-item-container"> <div class="collapse-item-container">
<div class="collapse-item-input"> <div class="collapse-item-input">
<input <input type="text" v-model="emailOperation.email.address" readonly="true" v-tooltip title="Click to update"
type="text" delay='{"show":"500", "hide":"100"}' @click="edittingEmail($event)" @blur="stopEdittingEmail($event)"
v-model="emailOperation.email.address" @keyup.enter="blurInput($event)" />
readonly="true"
v-tooltip
title="Click to update"
delay='{"show":"500", "hide":"100"}'
@click="edittingEmail($event)"
@blur="stopEdittingEmail($event)"
@keyup.enter="blurInput($event)"
/>
</div> </div>
<div v-if="emailOperation.verifyingMode" class="collapse-item-input"> <div v-if="emailOperation.verifyingMode" class="collapse-item-input">
<input <input type="text" v-model="emailOperation.verificationCode" placeholder="verification code" v-tooltip
type="text" title="Put the verification code received in the email" delay='{"show":"500", "hide":"100"}'
v-model="emailOperation.verificationCode" @blur="stopEdittingEmailVerificationCode($event)" @keyup.enter="blurInput($event)" />
placeholder="verification code"
v-tooltip
title="Put the verification code received in the email"
delay='{"show":"500", "hide":"100"}'
@blur="stopEdittingEmailVerificationCode($event)"
@keyup.enter="blurInput($event)"
/>
<svg-icon icon="msg-enter" class-name="enter-icon" /> <svg-icon icon="msg-enter" class-name="enter-icon" />
<p v-if="emailOperation.message" class="error-message">{{ emailOperation.message }}</p> <p v-if="emailOperation.message" class="error-message">{{ emailOperation.message }}</p>
</div> </div>
<button <button v-if="!emailOperation.verifyingMode" class="btn btn-link" :disabled="emailOperation.email.verified"
v-if="!emailOperation.verifyingMode" @click="startVerifyingEmail()" v-tooltip :title="emailOperation.email.verified
class="btn btn-link"
:disabled="emailOperation.email.verified"
@click="startVerifyingEmail()"
v-tooltip
:title="
emailOperation.email.verified
? 'The email has been verified' ? 'The email has been verified'
: 'The email needs to be verify' : 'The email needs to be verify'
" " delay='{"show":"500", "hide":"100"}'>
delay='{"show":"500", "hide":"100"}'
>
{{ emailOperation.email.verified ? 'Verified' : 'Verify' }} {{ emailOperation.email.verified ? 'Verified' : 'Verify' }}
</button> </button>
</div> </div>
</div> </div>
<div <div class="collapse collapse-content-container" id="collapse-user-mobile" aria-labelledby="account-summary"
class="collapse collapse-content-container" data-bs-parent="#account-panel">
id="collapse-user-mobile"
aria-labelledby="account-summary"
data-bs-parent="#account-panel"
>
<div class="collapse-item-container"> <div class="collapse-item-container">
<div class="collapse-item-input"> <div class="collapse-item-input">
<input <input type="text" v-model="mobileOperation.mobile.number" readonly="true" v-tooltip
type="text" title="Click to update, be sure to preappend country code, i.e. +86 for China"
v-model="mobileOperation.mobile.number" @click="edittingMobile($event)" @blur="stopEdittingMobile($event)" @keyup.enter="blurInput($event)" />
readonly="true"
v-tooltip
title="Click to update"
@click="edittingMobile($event)"
@blur="stopEdittingMobile($event)"
@keyup.enter="blurInput($event)"
/>
</div> </div>
<div v-if="mobileOperation.verifyingMode" class="collapse-item-input"> <div v-if="mobileOperation.verifyingMode" class="collapse-item-input">
<input <input type="text" v-model="mobileOperation.verificationCode" placeholder="verification code" v-tooltip
type="text" title="Put the verification code received in the mobile number" delay='{"show":"500", "hide":"100"}'
v-model="mobileOperation.verificationCode" @blur="stopEdittingMobileVerificationCode($event)" @keyup.enter="blurInput($event)" />
placeholder="verification code"
v-tooltip
title="Put the verification code received in the mobile number"
delay='{"show":"500", "hide":"100"}'
@blur="stopEdittingMobileVerificationCode($event)"
@keyup.enter="blurInput($event)"
/>
<svg-icon icon="msg-enter" class-name="enter-icon" /> <svg-icon icon="msg-enter" class-name="enter-icon" />
<p v-if="mobileOperation.message" class="error-input">{{ mobileOperation.message }}</p> <p v-if="mobileOperation.message" class="error-input">{{ mobileOperation.message }}</p>
</div> </div>
<button <button v-if="!mobileOperation.verifyingMode" class="btn btn-link" :disabled="mobileOperation.mobile.verified"
v-if="!mobileOperation.verifyingMode" @click="startVerifyingMobile()" v-tooltip :title="mobileOperation.mobile.verified
class="btn btn-link"
:disabled="mobileOperation.mobile.verified"
@click="startVerifyingMobile()"
v-tooltip
:title="
mobileOperation.mobile.verified
? 'The mobile number has been verified' ? 'The mobile number has been verified'
: 'The mobile number needs to be verify' : 'The mobile number needs to be verify'
" " delay='{"show":"500", "hide":"100"}'>
delay='{"show":"500", "hide":"100"}'
>
{{ mobileOperation.mobile.verified ? 'Verified' : 'Verify' }} {{ mobileOperation.mobile.verified ? 'Verified' : 'Verify' }}
</button> </button>
</div> </div>
@ -242,13 +137,8 @@
<label for="personal-summary">{{ $t('Personal') }}</label> <label for="personal-summary">{{ $t('Personal') }}</label>
</div> </div>
<div class="panel-content-container" id="personal-summary"> <div class="panel-content-container" id="personal-summary">
<button <button class="panel-item-container" data-bs-toggle="collapse" data-bs-target="#collapse-user-identity"
class="panel-item-container" aria-expanded="false" aria-controls="collapse-user-identity">
data-bs-toggle="collapse"
data-bs-target="#collapse-user-identity"
aria-expanded="false"
aria-controls="collapse-user-identity"
>
<div class="profile-item-container"> <div class="profile-item-container">
<label class="profile-item-label" for="account-summary-user-fullname">{{ <label class="profile-item-label" for="account-summary-user-fullname">{{
$t('Full name') $t('Full name')
@ -259,36 +149,20 @@
</span> </span>
</div> </div>
</button> </button>
<button <button class="panel-item-container" data-bs-toggle="collapse" data-bs-target="#collapse-personal-user-photo"
class="panel-item-container" aria-expanded="false" aria-controls="collapse-personal-user-photo">
data-bs-toggle="collapse"
data-bs-target="#collapse-personal-user-photo"
aria-expanded="false"
aria-controls="collapse-personal-user-photo"
>
<div class="profile-item-container profile-photo-container"> <div class="profile-item-container profile-photo-container">
<img <img class="profile-photo" alt="user portrait" id="personal-photo-operation-image" :src="userProfile.account.basic.photo.base64
class="profile-photo"
alt="user portrait"
id="personal-photo-operation-image"
:src="
userProfile.account.basic.photo.base64
? userProfile.account.basic.photo.base64 ? userProfile.account.basic.photo.base64
: profileUrl : profileUrl
" " />
/>
<label class="profile-item-label" for="personal-photo-operation-image">{{ <label class="profile-item-label" for="personal-photo-operation-image">{{
$t('Portrait') $t('Portrait')
}}</label> }}</label>
</div> </div>
</button> </button>
<button <button class="panel-item-container" data-bs-toggle="collapse" data-bs-target="#collapse-personal-user-intro"
class="panel-item-container" aria-expanded="false" aria-controls="collapse-personal-user-intro">
data-bs-toggle="collapse"
data-bs-target="#collapse-personal-user-intro"
aria-expanded="false"
aria-controls="collapse-personal-user-intro"
>
<div class="profile-item-container"> <div class="profile-item-container">
<label class="profile-item-label" for="personal-summary-self-intro">{{ <label class="profile-item-label" for="personal-summary-self-intro">{{
$t('Self-intro') $t('Self-intro')
@ -298,13 +172,8 @@
</span> </span>
</div> </div>
</button> </button>
<button <button class="panel-item-container" data-bs-toggle="collapse" data-bs-target="#collapse-personal-earning-now"
class="panel-item-container" aria-expanded="false" aria-controls="collapse-personal-earning-now">
data-bs-toggle="collapse"
data-bs-target="#collapse-personal-earning-now"
aria-expanded="false"
aria-controls="collapse-personal-earning-now"
>
<div class="profile-item-container"> <div class="profile-item-container">
<label class="profile-item-label" for="personal-summary-earning-now">{{ <label class="profile-item-label" for="personal-summary-earning-now">{{
$t('Earning now') $t('Earning now')
@ -316,198 +185,102 @@
</button> </button>
</div> </div>
</div> </div>
<div <div class="collapse collapse-content-container" id="collapse-user-identity" aria-labelledby="personal-summary"
class="collapse collapse-content-container" data-bs-parent="#personal-panel">
id="collapse-user-identity"
aria-labelledby="personal-summary"
data-bs-parent="#personal-panel"
>
<div class="collapse-item-container"> <div class="collapse-item-container">
<div class="collapse-item-input"> <div class="collapse-item-input">
<input <input type="text" v-model="identityOperation.first_name" placeholder="First Name" v-tooltip
type="text" title="Click to edit" delay='{"show":"500", "hide":"100"}' readonly="true"
v-model="identityOperation.first_name" @click="edittingFirstname($event)" @blur="stopEdittingFirstname($event)"
placeholder="First Name" @keyup.enter="blurInput($event)" />
v-tooltip
title="Click to edit"
delay='{"show":"500", "hide":"100"}'
readonly="true"
@click="edittingFirstname($event)"
@blur="stopEdittingFirstname($event)"
@keyup.enter="blurInput($event)"
/>
</div> </div>
<div class="collapse-item-input"> <div class="collapse-item-input">
<input <input type="text" v-model="identityOperation.last_name" placeholder="Last Name" readonly="true"
type="text" @click="edittingLastname($event)" @blur="stopEdittingLastname($event)" @keyup.enter="blurInput($event)"
v-model="identityOperation.last_name" v-tooltip title="Click to edit" delay='{"show":"500", "hide":"100"}' />
placeholder="Last Name"
readonly="true"
@click="edittingLastname($event)"
@blur="stopEdittingLastname($event)"
@keyup.enter="blurInput($event)"
v-tooltip
title="Click to edit"
delay='{"show":"500", "hide":"100"}'
/>
</div> </div>
</div> </div>
</div> </div>
<div <div class="collapse collapse-content-container" id="collapse-personal-user-photo"
class="collapse collapse-content-container" aria-labelledby="personal-summary" data-bs-parent="#personal-panel">
id="collapse-personal-user-photo"
aria-labelledby="personal-summary"
data-bs-parent="#personal-panel"
>
<div class="collapse-item-container"> <div class="collapse-item-container">
<label class="btn btn-link" for="personal-photo-operation-image"> <label class="btn btn-link" for="personal-photo-operation-image">
<img <img class="user-portrait-img" id="personal-photo-operation-image" alt="user portrait" :src="userProfile.account.basic.photo.base64
class="user-portrait-img"
id="personal-photo-operation-image"
alt="user portrait"
:src="
userProfile.account.basic.photo.base64
? userProfile.account.basic.photo.base64 ? userProfile.account.basic.photo.base64
: profileUrl : profileUrl
" " v-tooltip title="Click to update" @click="selectUserPhoto()" />
v-tooltip
title="Click to update"
@click="selectUserPhoto()"
/>
</label> </label>
<input <input ref="uploadUserPhotoInput" type="file" :accept="identityOperation.photo.acceptableType" hidden
ref="uploadUserPhotoInput" @change="onUserPhotoChange($event)" />
type="file"
:accept="identityOperation.photo.acceptableType"
hidden
@change="onUserPhotoChange($event)"
/>
</div> </div>
</div> </div>
<div <div class="collapse collapse-content-container" id="collapse-personal-user-intro"
class="collapse collapse-content-container" aria-labelledby="personal-summary" data-bs-parent="#personal-panel">
id="collapse-personal-user-intro"
aria-labelledby="personal-summary"
data-bs-parent="#personal-panel"
>
<div class="collapse-item-container"> <div class="collapse-item-container">
<div class="collapse-item-editor"> <div class="collapse-item-editor">
<freeleaps-editor <freeleaps-editor v-model:content="personalOperation.self_intro.content_html"
v-model:content="personalOperation.self_intro.content_html" :disabled="!personalOperation.self_intro.is_editing" />
:disabled="!personalOperation.self_intro.is_editing"
/>
<div class="btn-group-container"> <div class="btn-group-container">
<button <button v-if="!personalOperation.self_intro.is_editing" class="btn btn-link"
v-if="!personalOperation.self_intro.is_editing" @click="personalOperation.self_intro.is_editing = true">
class="btn btn-link"
@click="personalOperation.self_intro.is_editing = true"
>
{{ $t('Edit') }} {{ $t('Edit') }}
</button> </button>
<button <button v-if="personalOperation.self_intro.is_editing" class="btn btn-link" type="button"
v-if="personalOperation.self_intro.is_editing" data-bs-toggle="offcanvas" data-bs-target="#offcanvas-template" aria-controls="offcanvas-template">
class="btn btn-link"
type="button"
data-bs-toggle="offcanvas"
data-bs-target="#offcanvas-template"
aria-controls="offcanvas-template"
>
{{ $t('Templates') }} {{ $t('Templates') }}
</button> </button>
<button <button v-if="personalOperation.self_intro.is_editing" @click="updateSelfIntro()" class="btn btn-link">
v-if="personalOperation.self_intro.is_editing"
@click="updateSelfIntro()"
class="btn btn-link"
>
{{ $t('Update') }} {{ $t('Update') }}
</button> </button>
<button <button v-if="personalOperation.self_intro.is_editing" @click="stopEdittingSelfintro($event)"
v-if="personalOperation.self_intro.is_editing" class="btn btn-link">
@click="stopEdittingSelfintro($event)"
class="btn btn-link"
>
{{ $t('Cancel') }} {{ $t('Cancel') }}
</button> </button>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div <div class="collapse collapse-content-container" id="collapse-personal-earning-now"
class="collapse collapse-content-container" aria-labelledby="personal-summary" data-bs-parent="#personal-panel">
id="collapse-personal-earning-now"
aria-labelledby="personal-summary"
data-bs-parent="#personal-panel"
>
<div class="collapse-checkbox-container"> <div class="collapse-checkbox-container">
<div class="form-check form-switch"> <div class="form-check form-switch">
<input <input class="form-check-input" type="checkbox" role="switch" id="personal-earning-now-checkbox"
class="form-check-input" v-model="personalOperation.accepting_request" @click="updateAcceptingRequest($event)"
type="checkbox" :disabled="!paymentOperation.ready_to_receive_money" />
role="switch"
id="personal-earning-now-checkbox"
v-model="personalOperation.accepting_request"
@click="updateAcceptingRequest($event)"
:disabled="!paymentOperation.ready_to_receive_money"
/>
<label class="form-check-label" for="personal-earning-now-checkbox"> <label class="form-check-label" for="personal-earning-now-checkbox">
<span>{{ $t('I want to be a service provider and earn money') }}</span> <span>{{ $t('I want to be a service provider and earn money') }}</span>
<span v-if="personalOperation.show_stripe_status" style="color: red" <span v-if="personalOperation.show_stripe_status" style="color: red">*&nbsp;{{ $t('Stripe account' +
>*&nbsp;{{ $t('Stripe account' + 'onboarding is not completed.') }}</span 'onboarding is not completed.') }}</span>
>
</label> </label>
</div> </div>
<div class="flex-1" /> <div class="flex-1" />
<div class="collapse-item-input"> <div class="collapse-item-input">
<input <input id="personal-expected-salary" v-tooltip title="Click to edit" delay='{"show":"500", "hide":"100"}'
id="personal-expected-salary" readonly="true" @click="edittingExpectedSalary($event)" @blur="stopedittingExpectedSalary($event)"
v-tooltip @keyup.enter="blurInput($event)" v-model="personalOperation.expected_salary.hourly" />
title="Click to edit"
delay='{"show":"500", "hide":"100"}'
readonly="true"
@click="edittingExpectedSalary($event)"
@blur="stopedittingExpectedSalary($event)"
@keyup.enter="blurInput($event)"
v-model="personalOperation.expected_salary.hourly"
/>
<span class="collapse-item-currency">{{ <span class="collapse-item-currency">{{
userProfile.account.provider.expected_salary.currency userProfile.account.provider.expected_salary.currency
}}</span> }}</span>
</div> </div>
</div> </div>
<div class="collapse-item-container"> <div class="collapse-item-container">
<label <label v-if="Is_Wechat_QR_Code_Payment()" class="collapse-item-uploader" for="qr-uploader">
v-if="Is_Wechat_QR_Code_Payment()" <img v-if="paymentOperation.wechat_qr_code_img.data" class="uploader-img-show"
class="collapse-item-uploader" :src="paymentOperation.wechat_qr_code_img.data" />
for="qr-uploader" <img v-if="!paymentOperation.wechat_qr_code_img.data" class="uploader-img-btn"
> src="@/assets/images/qr-code.png" />
<img
v-if="paymentOperation.wechat_qr_code_img.data"
class="uploader-img-show"
:src="paymentOperation.wechat_qr_code_img.data"
/>
<img
v-if="!paymentOperation.wechat_qr_code_img.data"
class="uploader-img-btn"
src="@/assets/images/qr-code.png"
/>
<span v-if="!paymentOperation.wechat_qr_code_img.data" class="upload-text-btn">{{ <span v-if="!paymentOperation.wechat_qr_code_img.data" class="upload-text-btn">{{
$t('Upload QR code to receive payment') $t('Upload QR code to receive payment')
}}</span> }}</span>
</label> </label>
<input <input v-if="Is_Wechat_QR_Code_Payment()" ref="uploadWechatQRCodePhotoInput" type="file" id="qr-uploader"
v-if="Is_Wechat_QR_Code_Payment()" :accept="paymentOperation.wechat_qr_code_img.acceptableType" hidden
ref="uploadWechatQRCodePhotoInput" @change="onUploadWechatQRCodePhoto($event)" />
type="file"
id="qr-uploader"
:accept="paymentOperation.wechat_qr_code_img.acceptableType"
hidden
@change="onUploadWechatQRCodePhoto($event)"
/>
</div> </div>
<div v-if="Is_Stripe_Payment()" class="collapse-item-container"> <div v-if="Is_Stripe_Payment()" class="collapse-item-container">
<span>{{ $t('Have you linked your strip account?') }}</span <span>{{ $t('Have you linked your strip account?') }}</span><button class="btn btn-link"
><button class="btn btn-link" @click="visitStripe()">{{ $t('Visit Stripe') }}</button> @click="visitStripe()">{{ $t('Visit Stripe') }}</button>
</div> </div>
<div v-if="personalOperation.accepting_request" class="collapse-item-container"> <div v-if="personalOperation.accepting_request" class="collapse-item-container">
<span>{{ <span>{{
@ -672,49 +445,26 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<div <div class="offcanvas offcanvas-end offcanvas-container" tabindex="-1" id="offcanvas-template"
class="offcanvas offcanvas-end offcanvas-container" aria-labelledby="offcanvas-template">
tabindex="-1"
id="offcanvas-template"
aria-labelledby="offcanvas-template"
>
<div class="offcanvas-header"> <div class="offcanvas-header">
<h5 class="offcanvas-title" id="offcanvas-template"> <h5 class="offcanvas-title" id="offcanvas-template">
{{ $t('Apply self-intro template') }} {{ $t('Apply self-intro template') }}
</h5> </h5>
<button <button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="Close"></button>
type="button"
class="btn-close"
data-bs-dismiss="offcanvas"
aria-label="Close"
></button>
</div> </div>
<div class="offcanvas-body"> <div class="offcanvas-body">
<div class="accordion" id="template-item-container"> <div class="accordion" id="template-item-container">
<div <div v-for="(template, index) in availableTemplates" :key="index" :id="'template' + index"
v-for="(template, index) in availableTemplates" class="accordion-item">
:key="index"
:id="'template' + index"
class="accordion-item"
>
<h2 class="accordion-header" :id="'heading' + index"> <h2 class="accordion-header" :id="'heading' + index">
<button <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
class="accordion-button collapsed" :data-bs-target="'#' + 'collapse' + index" aria-expanded="false" :aria-controls="'collapse' + index">
type="button"
data-bs-toggle="collapse"
:data-bs-target="'#' + 'collapse' + index"
aria-expanded="false"
:aria-controls="'collapse' + index"
>
{{ template.title }} {{ template.title }}
</button> </button>
</h2> </h2>
<div <div :id="'collapse' + index" class="accordion-collapse collapse" :aria-labelledby="'heading' + index"
:id="'collapse' + index" data-bs-parent="#template-item-container">
class="accordion-collapse collapse"
:aria-labelledby="'heading' + index"
data-bs-parent="#template-item-container"
>
<div class="accordion-body"> <div class="accordion-body">
<button class="select-template-button" @click="selectTemplate(template)"> <button class="select-template-button" @click="selectTemplate(template)">
{{ $t('Apply') }} {{ $t('Apply') }}

View File

@ -103,7 +103,7 @@ export default {
fetchConversations() { fetchConversations() {
this.$store.dispatch('basic/updateConversationsPage', { this.$store.dispatch('basic/updateConversationsPage', {
token: this.mnx_getUserAuthToken(), token: this.mnx_getUserAuthToken(),
cb: error => { cb: (error) => {
this.mnx_backendErrorHandler(error) this.mnx_backendErrorHandler(error)
} }
}) })

View File

@ -1485,8 +1485,8 @@ export default {
&:disabled { &:disabled {
color: #000000; color: #000000;
border-color: #D9D9D9; border-color: #d9d9d9;
background-color: #D9D9D9; background-color: #d9d9d9;
opacity: 1; opacity: 1;
} }
} }

View File

@ -4,8 +4,14 @@
<div class="accordion" id="workspace-project-accordion"> <div class="accordion" id="workspace-project-accordion">
<div v-if="project.id" class="accordion-item"> <div v-if="project.id" class="accordion-item">
<h2 class="accordion-header"> <h2 class="accordion-header">
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" <button
data-bs-target="#collapse-project-issue" aria-expanded="false" aria-controls="collapse-project-issue"> class="accordion-button collapsed"
type="button"
data-bs-toggle="collapse"
data-bs-target="#collapse-project-issue"
aria-expanded="false"
aria-controls="collapse-project-issue"
>
<div class="project-issue-bar-container dashed-container"> <div class="project-issue-bar-container dashed-container">
<div class="project-issue-open-issues"> <div class="project-issue-open-issues">
<label class="project-item-label">{{ $t('Summary') }}</label> <label class="project-item-label">{{ $t('Summary') }}</label>
@ -32,27 +38,41 @@
</div> </div>
</button> </button>
</h2> </h2>
<div id="collapse-project-issue" class="accordion-collapse collapse" data-bs-parent="#collapse-project-issue"> <div
id="collapse-project-issue"
class="accordion-collapse collapse"
data-bs-parent="#collapse-project-issue"
>
<div class="project-invite-collaborator-containter"> <div class="project-invite-collaborator-containter">
<button class="accordion-button collapsed" type="button" ref="issueAddBtn" data-bs-toggle="collapse" <button
data-bs-target="#collapse-project-new-issue" aria-expanded="false" class="accordion-button collapsed"
aria-controls="collapse-project-issue"> type="button"
ref="issueAddBtn"
data-bs-toggle="collapse"
data-bs-target="#collapse-project-new-issue"
aria-expanded="false"
aria-controls="collapse-project-issue"
>
<div class="project-invite-collaborator">+ {{ $t('Add Issue') }}</div> <div class="project-invite-collaborator">+ {{ $t('Add Issue') }}</div>
</button> </button>
<div id="collapse-project-new-issue" class="accordion-collapse collapse" <div
data-bs-parent="#collapse-project-new-issue"> id="collapse-project-new-issue"
class="accordion-collapse collapse"
data-bs-parent="#collapse-project-new-issue"
>
<div class="project-issue-description-container"> <div class="project-issue-description-container">
<div class="project-issue-description"> <div class="project-issue-description">
<label class="project-item-label">{{ <label class="project-item-label">{{ $t('New issue description') }}</label>
$t('New issue description') <button
}}</label> class="project-issue-description-btn"
<button class="project-issue-description-btn" @click=" @click="
postNewIssue( postNewIssue(
project.request.product_id, project.request.product_id,
project.project_id, project.project_id,
newIssueDescriptions newIssueDescriptions
) )
"> "
>
{{ $t('Submit') }} {{ $t('Submit') }}
</button> </button>
</div> </div>
@ -61,13 +81,22 @@
</div> </div>
</div> </div>
<div> <div>
<div class="project-issue-container" v-for="(issue, issue_index) in project.project.issue.open_issues" <div
:key="issue_index" :id="'project-issue-' + issue_index"> class="project-issue-container"
v-for="(issue, issue_index) in project.project.issue.open_issues"
:key="issue_index"
:id="'project-issue-' + issue_index"
>
<div class="accordion-item"> <div class="accordion-item">
<h2 class="accordion-header"> <h2 class="accordion-header">
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" <button
:data-bs-target="'#collapse-project-issue-details' + issue_index" aria-expanded="false" class="accordion-button collapsed"
aria-controls="collapse-project-issue-details"> type="button"
data-bs-toggle="collapse"
:data-bs-target="'#collapse-project-issue-details' + issue_index"
aria-expanded="false"
aria-controls="collapse-project-issue-details"
>
<div class="project-issue-header dashed-container"> <div class="project-issue-header dashed-container">
<div class="project-issue-title"> <div class="project-issue-title">
<label class="project-item-label">{{ $t('Issue title') }}</label> <label class="project-item-label">{{ $t('Issue title') }}</label>
@ -88,23 +117,33 @@
</div> </div>
</button> </button>
</h2> </h2>
<div :id="'collapse-project-issue-details' + issue_index" class="accordion-collapse collapse" <div
:data-bs-parent="'#collapse-project-issue-details' + issue_index"> :id="'collapse-project-issue-details' + issue_index"
class="accordion-collapse collapse"
:data-bs-parent="'#collapse-project-issue-details' + issue_index"
>
<div class="project-issue-description-container"> <div class="project-issue-description-container">
<div class="project-issue-description"> <div class="project-issue-description">
<label class="project-item-label">{{ <label class="project-item-label">{{ $t('Issue description') }}</label>
$t('Issue description') <button
}}</label> :hidden="!showIssueActionButton(project.project, issue, 'Resolve')"
<button :hidden="!showIssueActionButton(project.project, issue, 'Resolve') class="project-issue-description-btn"
" class="project-issue-description-btn" @click="setProjectIssueStatus(issue.id, 1)"> @click="setProjectIssueStatus(issue.id, 1)"
>
{{ $t('Resolve') }} {{ $t('Resolve') }}
</button> </button>
<button :hidden="!showIssueActionButton(project.project, issue, 'Confirm') <button
" class="project-issue-description-btn" @click="setProjectIssueStatus(issue.id, 2)"> :hidden="!showIssueActionButton(project.project, issue, 'Confirm')"
class="project-issue-description-btn"
@click="setProjectIssueStatus(issue.id, 2)"
>
{{ $t('Confirm') }} {{ $t('Confirm') }}
</button> </button>
<button :hidden="!showIssueActionButton(project.project, issue, 'Reopen')" <button
class="project-issue-description-btn" @click="setProjectIssueStatus(issue.id, 0)"> :hidden="!showIssueActionButton(project.project, issue, 'Reopen')"
class="project-issue-description-btn"
@click="setProjectIssueStatus(issue.id, 0)"
>
{{ $t('Reopen') }} {{ $t('Reopen') }}
</button> </button>
</div> </div>
@ -122,7 +161,11 @@
</template> </template>
<script> <script>
import { DateUtils, WorksapceApi } from '@/utils/index' import { DateUtils, WorksapceApi } from '@/utils/index'
import { projectStatusEnum, convertIntoToProjectIssueStatus, projectIssueStatusEnum } from '@/types/index' import {
projectStatusEnum,
convertIntoToProjectIssueStatus,
projectIssueStatusEnum
} from '@/types/index'
export default { export default {
name: 'projectIssue', name: 'projectIssue',
props: { props: {
@ -209,7 +252,7 @@ export default {
default: default:
return false return false
} }
}, }
} }
} }
</script> </script>