公历和农历

hdApp/src/admin/member/detail.vue

@@ -84,7 +84,9 @@
           <view class="contact-row">
             <text class="contact-label">生日</text>
             <text class="contact-value" v-if="Number(data.birthdayMonth)>0">
-              {{ data.lunar==1?"农历 ":"" }}{{ data.birthdayMonth }}月{{ data.birthdayDate }}日 <text @click="modifyBirthday()" style="color:#007aff;margin-left:20upx;">修改</text>
+              {{ data.lunar==1?"农历 ":"" }}{{ data.birthdayMonth }}月{{ data.birthdayDate }}日
+              <text v-if="data.birthday!='0000-00-00'">（{{data.birthday}}）</text>
+              <text @click="modifyBirthday()" style="color:#007aff;margin-left:20upx;">修改</text>
             </text>
             <text class="contact-value" v-else>
               <text style="color:#007aff;" @click="modifyBirthday()">设置</text>
@@ -367,7 +369,7 @@
                   class="admin-button-com middle" 
                   :class="[birthdayType == 0 ? 'blue' : 'default']" 
                   @click="birthdayType = 0"
-                >阳历</button>
+                >公历</button>
                 <button 
                   class="admin-button-com middle" 
                   :class="[birthdayType == 1 ? 'blue' : 'default']" 
@@ -530,7 +532,7 @@ export default {
       upgradeModal: false,
       remarkModal: false,
       birthdayModal: false,
-      birthdayType: 0, // 0阳历 1农历
+      birthdayType: 0, // 0公历 1农历
       birthdayMonth: '', // 选择的月份
       birthdayDate: '', // 选择的日期
       dateArray: Array.from({length: 31}, (_, i) => i + 1), // 1-31的数组

hdApp/src/api/custom/index.js

@@ -31,4 +31,8 @@ export const modifyAddress = data => {
 
 export const debtRecordList = data => {
 	return https.get('/custom-debt-record/list', data)
+}
+
+export const modifyBirthday = data => {
+	return https.get('/custom/modify-birthday', data)
 }