Merge branch 'master' of ssh://192.168.0.10:29418/pcalife/PAM

Tomas

2021-12-01 cd5ab4c89c25b3e771a8ead60e0b9953b47a1525

Merge branch 'master' of ssh://192.168.0.10:29418/pcalife/PAM

 PAMapp/components/QuickFilter/QuickFilterSelector.vue

@@ -7,7 +7,7 @@
            <span
                class="smTxt_bold text--primary"
                v-if="questionOption.name === 'communicationStyles'"
            >(可複選)</span>
            >(最多選擇兩種)</span>
            <span
                class="smTxt_bold text--primary"
                v-if="questionOption.name === 'avgScore'"
@@ -25,6 +25,7 @@
                    :label="i.value"
                    :name="i.value"
                    :class="i.className"
                    @change="selectedCommunicationStyles"
                ></el-checkbox>
            </el-checkbox-group>
        </div>
@@ -113,6 +114,12 @@
            || name === 'communicationStyles' && !this.pickedItem[name].length
    }

    selectedCommunicationStyles() {
        if (this.pickedItem.communicationStyles.length > 2) {
            this.pickedItem.communicationStyles.shift();
        }
    }

    @Emit('confirm')
    confirm() {
        const name = this.questionOption.name;

 PAMapp/pages/accountSetting/index.vue

@@ -23,7 +23,7 @@
        
    </section>

    <section class="account-card" :class="{'edit': !userPhoneDisabled }"> 
    <section class="account-card" :class="{'edit': !userPhoneDisabled }" v-if="phoneValue"> 
        <div class="header">
            <div class="block">   
            <div class="setting-title">綁定</div>
@@ -44,15 +44,14 @@
                </div>
            </div>
            </div>
            
            <i class="icon-edit icon" 
            <!-- <i class="icon-edit icon" 
                @click="editField('userPhone')"
                :class="{'icon-color-change': !userPhoneDisabled}"></i>
                :class="{'icon-color-change': !userPhoneDisabled}"></i> -->
        </div>
        
    </section>

    <section class="account-card" :class="{'edit': !userEmailDisabled }"> 
    <section class="account-card" :class="{'edit': !userEmailDisabled }" v-if="emailValue"> 
        <div class="header">
            <div class="block">
            <div class="setting-title">綁定</div>
@@ -73,8 +72,8 @@
                </div>
                </div>
                
                <i class="icon-edit icon" @click="editField('userEmail')" 
                        :class="{'icon-color-change': !userEmailDisabled}"></i>
                <!-- <i class="icon-edit icon" @click="editField('userEmail')" 
                        :class="{'icon-color-change': !userEmailDisabled}"></i> -->
        </div>
        
    </section>
@@ -249,7 +248,6 @@
.header{
    display: flex;
    align-items: baseline;
    justify-content: space-evenly;
}
.contact-input{
    font-size: 20px;