开发

ghsApp/src/config.js

@@ -1,4 +1,4 @@
 export const ProjectName = 'ghs'
-export const APIHOST = 'http://api.shop.hzghd.com'
-export const IMGHOST = 'http://img.hzghd.com'
+export const APIHOST = 'https://api.shop.hzghd.com'
+export const IMGHOST = 'https://img.hzghd.com'
 export const CURRENT_ENV = 'dev'

ghsApp/src/ext.json

@@ -4,9 +4,9 @@
   "directCommit": false,
   "ext": {
     "account": 12362,
-    "apiHost": "http://api.shop.hzghd.com",
+    "apiHost": "https://api.shop.hzghd.com",
     "socketApiHost": "api.shop.hzghd.com",
-    "imgHost": "http://img.hzghd.com",
+    "imgHost": "https://img.hzghd.com",
     "name":"花掌柜"
   }
 }

ghsApp/src/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('http://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.eot');
-  src: url('http://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
-  url('http://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
-  url('http://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
-  url('http://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
-  url('http://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
+  src: url('https://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.eot');
+  src: url('https://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
+  url('https://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
+  url('https://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
+  url('https://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
+  url('https://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
 }
 
 .iconfont {

hdPad/src/config.js

@@ -1,4 +1,4 @@
 export const ProjectName = 'hd'
-export const APIHOST = 'http://api.shop.huaml.com'
-export const IMGHOST = 'http://img.huaml.com'
+export const APIHOST = 'https://api.shop.huaml.com'
+export const IMGHOST = 'https://img.huaml.com'
 export const CURRENT_ENV = 'dev'

hdPad/src/ext.json

@@ -4,9 +4,9 @@
   "directCommit": false,
   "ext": {
     "account": 12362,
-    "apiHost": "http://api.shop.huaml.com",
+    "apiHost": "https://api.shop.huaml.com",
     "socketApiHost": "api.shop.huaml.com",
-    "imgHost": "http://img.huaml.com",
+    "imgHost": "https://img.huaml.com",
     "name":"花美玲"
   }
 }

hdPad/src/pages/home/components/birthdayEdit.vue

@@ -69,6 +69,7 @@
         
         <!-- 操作按钮 -->
         <div class="birthday-actions">
+            <button class="birthday-action-btn cancel-btn" @click="cancelEdit">取消</button>
             <button class="birthday-action-btn save-btn" @click="saveBirthday">保存</button>
         </div>
     </div>
@@ -111,6 +112,10 @@ export default {
             // 直接使用1到31的固定数组，不根据月份变化
             this.dateArray = Array.from({length: 31}, (_, i) => i + 1)
         },
+        // 取消编辑
+        cancelEdit() {
+            this.$emit('cancel')
+        },
         // 保存生日信息
         saveBirthday() {           
             const params = {

hdPad/src/pages/home/components/customInfo.vue

@@ -26,22 +26,22 @@
           </view>
         </view>
 
-        <view class="info-item">
+        <view class="info-item" @click="changeBirthday()">
           <text class="label">生日</text>
           <view class="value-container">
 
-            <text class="value" v-if="Number(customInfo.birthdayMonth)>0" @click="changeBirthday()">
+            <text class="value" v-if="Number(customInfo.birthdayMonth)>0">
               {{ customInfo.lunar==1?"农历 ":"" }}{{ customInfo.birthdayMonth }}月{{ customInfo.birthdayDate }}日
               <text v-if="customInfo.lunar==1 && customInfo.birthday!='0000-00-00'">（{{customInfo.birthday}}）</text>
             </text>
-            <text class="value" v-else @click="changeBirthday()">
+            <text class="value" v-else>
               <text style="color:#007aff;">设置</text>
             </text>
 
           </view>
         </view>
 
-        <view class="info-item">
+        <view class="info-item" @click="goRecharge()">
           <text class="label">余额</text>
           <text class="value highlight">{{customInfo.balance || '0'}}</text>
         </view>
@@ -61,7 +61,7 @@
           <text class="arrow">></text>
         </view>
 
-        <view class="info-item action-item" @tap="goRecharge()">
+        <view class="info-item action-item" @tap="">
           <text class="label">充值记录</text>
           <text class="arrow">></text>
         </view>

hdPad/src/pages/home/components/recharge.vue

@@ -110,6 +110,7 @@
 
     <!-- 底部按钮 -->
     <view class="footer-buttons">
+      <button class="admin-button-com middle default" @click="cancelRecharge">取消</button>
       <button class="admin-button-com middle blue" @click="confirmRecharge">充值</button>
     </view>
 
@@ -371,10 +372,10 @@ export default {
   border-top: 1px solid #eee;
   width: 100%;
   box-sizing: border-box;
+  gap: 10px;
   
   button {
     flex: 1;
-    width: 100%;
     height: 36px;
     display: flex;
     align-items: center;

hdPad/src/pages/home/custom.vue

@@ -24,7 +24,7 @@
                 <balanceChange ref="balanceChangeRef" :customId="selectCustomId"></balanceChange>
             </view>
             <view class="custom-asset" v-if="showIndex == 2">
-                <birthdayEdit ref="birthRef" :customId="selectCustomId" @refreshCustomInfo="refreshCustomInfo"></birthdayEdit>
+                <birthdayEdit ref="birthRef" :customId="selectCustomId" @refreshCustomInfo="refreshCustomInfo" @cancel="showIndex = 0"></birthdayEdit>
             </view>
             <view class="custom-asset" v-if="showIndex == 3">
                 <recharge ref="rechargeRef" :customId="selectCustomId" @cancel="showIndex = 0" @success="refreshCustomInfo"></recharge>
@@ -140,7 +140,7 @@ export default {
 .action-buttons-container {
     display: flex;
     flex-direction: column;
-    gap: 10px;
+    gap: 14px;
     padding: 8px;
 }
 
@@ -157,7 +157,6 @@ export default {
     font-size: 14px;
     color: #333;
     transition: all 0.2s;
-    
     &:active {
         background-color: #e9ecef;
     }

hdPad/src/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot');
-  src: url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
-  url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
-  url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
-  url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
-  url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
+  src: url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot');
+  src: url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
+  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
+  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
+  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
+  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
 }
 
 .iconfont {