Merge branch 'master' of http://git.huaml.com/zhh/front-end

hdApp/src/admin/home/me.vue

@@ -2,6 +2,7 @@
   <view class="me-page app-content">
     <block v-if="isLoggedIn">
       <view class="page-hero">
+        <view class="status-space" :style="{ height: statusBarHeight + 'px' }"></view>
         <view class="hero-panel">
           <view class="profile-card">
             <view class="profile-header-row">
@@ -47,10 +48,12 @@
         <view class="finance-col" v-if="lookMoney == 1">
           <view class="finance-label">账户余额（元）</view>
           <view class="finance-amount">￥{{ moneyFormat(myInfo.balance) }}</view>
-          <view class="finance-actions">
-            <view class="pill-btn" @click="pageTo({ url: '/pagesStore/me/shopYeChange' })">明细</view>
-            <view class="pill-btn" @click="pageTo({ url: '/pagesStore/me/withdraw' })">提现记录</view>
-            <view class="pill-btn" v-if="Number(myInfo.txBalance) > 0" @click="checkToApplyCash">提现</view>
+          <view class="finance-actions balance-actions">
+            <view class="balance-action-row">
+              <view class="pill-btn" @click="pageTo({ url: '/pagesStore/me/shopYeChange' })">变动明细</view>
+              <view class="pill-btn" @click="pageTo({ url: '/pagesStore/me/withdraw' })">提现记录</view>
+            </view>
+            <view class="pill-btn pill-btn-solid balance-withdraw-btn" v-if="Number(myInfo.txBalance) > 0" @click="checkToApplyCash">提现</view>
           </view>
         </view>
 
@@ -60,7 +63,7 @@
           <view class="finance-label">现金（元）</view>
           <view class="finance-amount">￥{{ moneyFormat(myInfo.money) }}</view>
           <view class="finance-actions">
-            <view class="pill-btn" @click="pageTo({ url: '/admin/home/moneyChangeList' })">明细</view>
+            <view class="pill-btn" @click="pageTo({ url: '/admin/home/moneyChangeList' })">变动明细</view>
             <view class="pill-btn" @click="outAmountFn">取出</view>
             <view class="pill-btn" @click="inAmountFn">存入</view>
           </view>
@@ -92,6 +95,7 @@
     <block v-else>
       <view class="guest-page">
         <view class="guest-hero">
+          <view class="status-space" :style="{ height: statusBarHeight + 'px' }"></view>
           <view class="guest-hero-inner">
             <text class="guest-hero-title">我的</text>
             <text class="guest-hero-desc">登录后管理门店</text>
@@ -164,11 +168,6 @@
               <input type="digit" ref="input" class="amount-input" v-model="outAmount" :adjust-position="false" />
             </view>
           </view>
-          <view class="inp-list-line remark-line">
-            <view class="line-input">
-              <input type="text" class="remark-input" v-model="outAmountRemark" maxlength="50" placeholder="备注（选填）" :adjust-position="false" />
-            </view>
-          </view>
         </view>
       </template>
     </modal-module>
@@ -181,11 +180,6 @@
               <input type="digit" ref="input" class="amount-input" v-model="inAmount" :adjust-position="false" />
             </view>
           </view>
-          <view class="inp-list-line remark-line">
-            <view class="line-input">
-              <input type="text" class="remark-input" v-model="inAmountRemark" maxlength="50" placeholder="备注（选填）" :adjust-position="false" />
-            </view>
-          </view>
         </view>
       </template>
     </modal-module>
@@ -268,13 +262,12 @@ export default {
   data () {
     return {
       constant: this.$constant,
+      statusBarHeight: 0,
       myInfo: {},
       version: "1.0.0",
       lookMoney: 0,
       inAmount: "",
       outAmount: "",
-      inAmountRemark: "",
-      outAmountRemark: "",
       outAmountShow: false,
       inAmountShow: false,
       menuList: [
@@ -316,6 +309,7 @@ export default {
     }
   },
   onLoad () {
+    this.setStatusBarHeight();
     // #ifdef APP-PLUS
     if (plus.runtime.version) {
       this.version = plus.runtime.version;
@@ -327,6 +321,14 @@ export default {
   },
   methods: {
     iconSrc,
+    setStatusBarHeight () {
+      try {
+        const systemInfo = uni.getSystemInfoSync();
+        this.statusBarHeight = systemInfo.statusBarHeight || 0;
+      } catch (e) {
+        this.statusBarHeight = 0;
+      }
+    },
     goLogin () {
       uni.removeStorageSync("manualLogout");
       this.$util.pageTo({ url: "/admin/home/login" });
@@ -418,36 +420,25 @@ export default {
       this.$util.pageTo({ url: "/admin/shop/myShop" });
     },
     inAmountFn () {
-      this.inAmountRemark = "";
       this.inAmountShow = true;
     },
     outAmountFn () {
-      this.outAmountRemark = "";
       this.outAmountShow = true;
     },
-    resetOutAmountForm () {
-      this.outAmount = "";
-      this.outAmountRemark = "";
-    },
-    resetInAmountForm () {
-      this.inAmount = "";
-      this.inAmountRemark = "";
-    },
     outAmountConfirm (val) {
       if (val.index == 0) {
         this.outAmountShow = false;
-        this.resetOutAmountForm();
         return;
       }
       if (this.$util.isEmpty(this.outAmount) || Number(this.outAmount) <= 0) {
         this.$msg("请填写金额");
         return false;
       }
-      outMoney({ amount: this.outAmount, remark: this.outAmountRemark }).then(res => {
+      outMoney({ amount: this.outAmount }).then(res => {
         if (res.code == 1) {
           this.$msg("操作成功");
           this.outAmountShow = false;
-          this.resetOutAmountForm();
+          this.outAmount = "";
           this.getMyInfo();
         }
       });
@@ -455,18 +446,17 @@ export default {
     inAmountConfirm (val) {
       if (val.index == 0) {
         this.inAmountShow = false;
-        this.resetInAmountForm();
         return;
       }
       if (this.$util.isEmpty(this.inAmount) || Number(this.inAmount) <= 0) {
         this.$msg("请填写金额");
         return false;
       }
-      inMoney({ amount: this.inAmount, remark: this.inAmountRemark }).then(res => {
+      inMoney({ amount: this.inAmount }).then(res => {
         if (res.code == 1) {
           this.$msg("操作成功");
           this.inAmountShow = false;
-          this.resetInAmountForm();
+          this.inAmount = "";
           this.getMyInfo();
         }
       });
@@ -538,10 +528,10 @@ export default {
   overflow: hidden;
   background: linear-gradient(
     180deg,
-    #a8d8bc 0%,
-    #b8e0c8 22%,
-    #c8e9d6 48%,
-    #daf0e4 76%,
+    #5db88a 0%,
+    #7acea7 35%,
+    #8ddcb7 58%,
+    #b4e5cd 76%,
     #f2f7f4 100%
   );
 }
@@ -563,6 +553,21 @@ export default {
   pointer-events: none;
 }
 
+/* #ifdef APP-PLUS */
+.page-hero {
+  overflow: visible;
+}
+
+.page-hero::after {
+  bottom: -150upx;
+  height: 260upx;
+}
+/* #endif */
+
+.status-space {
+  width: 100%;
+}
+
 .hero-panel {
   position: relative;
   z-index: 1;
@@ -686,6 +691,20 @@ export default {
   text-overflow: ellipsis;
 }
 
+/* #ifdef MP-WEIXIN */
+.quick-action-icon {
+  transform: translateY(40upx);
+}
+
+.quick-action + .quick-action {
+  margin-left: 60upx;
+}
+
+.quick-action-text {
+  display: none;
+}
+/* #endif */
+
 .expire-card {
   position: relative;
   overflow: hidden;
@@ -807,20 +826,19 @@ export default {
   font-weight: 800;
 }
 
-.finance-col .finance-actions {
+.cash-col .finance-actions {
   flex-wrap: nowrap;
   justify-content: space-between;
   margin-bottom: 0;
 }
 
-.finance-col .pill-btn {
+.cash-col .pill-btn {
   min-width: 0;
   height: 46upx;
   padding: 0 12upx;
   margin-right: 0;
   margin-bottom: 0;
-  font-size: 26upx;
-  white-space: nowrap;
+  font-size: 22upx;
 }
 
 .finance-actions {
@@ -837,6 +855,29 @@ export default {
   margin-bottom: 0;
 }
 
+.balance-actions {
+  flex-direction: column;
+  align-items: flex-start;
+  justify-content: flex-start;
+}
+
+.balance-action-row {
+  display: flex;
+  align-items: center;
+}
+
+.balance-action-row .pill-btn + .pill-btn {
+  margin-left: 12upx;
+}
+
+.balance-withdraw-btn {
+  margin-top: 14upx;
+}
+
+.finance-col:not(.cash-col) .finance-actions .pill-btn {
+  font-size: 24upx;
+}
+
 .pill-btn {
   min-width: 108upx;
   height: 50upx;
@@ -958,21 +999,6 @@ export default {
   box-sizing: border-box;
 }
 
-.remark-line {
-  margin-top: 20upx;
-}
-
-.remark-input {
-  width: 100%;
-  height: 72upx;
-  padding: 0 20upx;
-  border: 1upx solid #e5e9e7;
-  border-radius: 14upx;
-  color: #111416;
-  font-size: 28upx;
-  box-sizing: border-box;
-}
-
 .guest-page {
   min-height: 100vh;
   background: #f2f7f4;

hdApp/src/admin/home/member.vue

@@ -1,7 +1,15 @@
 <template>
   <view class="member-page app-content">
-    <view class="top-sticky">
-      <view class="hero-panel">
+    <view class="page-header">
+      <view class="status-space" :style="{ height: statusBarHeight + 'px' }"></view>
+      <view class="custom-nav">
+        <view class="nav-side"></view>
+        <view class="nav-title">客户</view>
+        <view class="nav-side"></view>
+      </view>
+    </view>
+
+    <view class="hero-panel">
       <view class="toolbar">
         <view class="search-style-btn" @click="changeSearchStyle">
           <image class="toolbar-icon" :src="iconSrc('order-switch')" mode="aspectFit" />
@@ -52,7 +60,6 @@
         </view>
       </view>
     </view>
-    </view>
 
     <view class="list-wrap">
       <block v-if="!$util.isEmpty(list.data)">
@@ -312,13 +319,6 @@ export default {
   background: #f5f8f6;
 }
 
-.top-sticky {
-  position: sticky;
-  top: 0;
-  z-index: 20;
-  background: #fff;
-}
-
 .page-header {
   padding: 0 22upx;
   background: linear-gradient(180deg, #e9f8ef 0%, #edf9f2 62%, #f4fbf7 100%);
@@ -329,14 +329,14 @@ export default {
 }
 
 .custom-nav {
-  min-height: 112upx;
+  min-height: 90upx;
   display: flex;
   align-items: center;
   justify-content: space-between;
 }
 
 .hero-panel {
-  padding: 4upx 22upx 0;
+  padding: 0 22upx 0;
   background: linear-gradient(180deg, #f7fbf8 0%, #fafcfa 56upx, #ffffff 108upx, #ffffff 100%);
   box-sizing: border-box;
 }
@@ -346,8 +346,9 @@ export default {
 }
 
 .nav-title {
-  color: #111416;
-  font-size: 28upx;
+  color: #08b85a;
+  font-size: 36upx;
+  font-weight: 700;
   line-height: 48upx;
 }
 
@@ -367,11 +368,7 @@ export default {
 }
 
 .toolbar > view:first-child {
-  margin-left: 10upx;
-}
-
-.toolbar > view:last-child {
-  margin-right: 12upx;
+  margin-left: 0;
 }
 
 .search-style-btn,

hdApp/src/admin/home/order.vue

@@ -1,5 +1,14 @@
 <template>
   <view class="order-page app-content">
+    <view class="page-header">
+      <view class="status-space" :style="{ height: statusBarHeight + 'px' }"></view>
+      <view class="custom-nav">
+        <view class="nav-side"></view>
+        <view class="nav-title">订单</view>
+        <view class="nav-side"></view>
+      </view>
+    </view>
+
     <view class="control-panel">
         <view class="filter-row">
           <view class="filter-chip date-chip">
@@ -731,7 +740,7 @@ export default {
 }
 
 .custom-nav {
-  min-height: 100upx;
+  min-height: 80upx;
   display: flex;
   align-items: center;
   justify-content: space-between;
@@ -742,8 +751,9 @@ export default {
 }
 
 .nav-title {
-  color: #252726;
-  font-size: 28upx;
+  color: #08b85a;
+  font-size: 36upx;
+  font-weight: 700;
   line-height: 48upx;
 }
 

hdApp/src/pages.json

@@ -5,13 +5,13 @@
 		{ "path": "admin/home/login","style": {"navigationBarTitleText": "","enablePullDownRefresh": false}},
 		{ "path": "admin/home/loginRemind","style": {"navigationBarTitleText": "登录提示","enablePullDownRefresh": false}},
 		{ "path": "admin/home/appLoginRemind","style": {"navigationBarTitleText": "无法登录怎么办","enablePullDownRefresh": false}},
-		{ "path": "admin/home/order", "style": { "navigationBarTitleText": "订单", "enablePullDownRefresh": true} },
-		{ "path": "admin/home/member", "style": { "navigationBarTitleText": "客户", "enablePullDownRefresh": true} },
+		{ "path": "admin/home/order", "style": { "navigationBarTitleText": "订单", "enablePullDownRefresh": true, "navigationStyle": "custom" } },
+		{ "path": "admin/home/member", "style": { "navigationBarTitleText": "客户", "enablePullDownRefresh": true, "navigationStyle": "custom" } },
 		{ "path": "admin/home/apply", "style": { "navigationBarTitleText": "应用", "enablePullDownRefresh": true } },
 		{ "path": "admin/home/close","style": {"navigationBarTitleText": "申请注销账号"}},
 		{"path": "admin/home/register","style": {"navigationBarTitleText": "服务协议"}},
 		{"path": "admin/home/privacy","style": {"navigationBarTitleText": "隐私政策"}},
-		{ "path": "admin/home/me", "style": { "navigationBarTitleText": "我的", "enablePullDownRefresh": true} },
+		{ "path": "admin/home/me", "style": { "navigationBarTitleText": "我的", "enablePullDownRefresh": true, "navigationStyle": "custom" } },
 		{ "path": "admin/home/moneyChangeList", "style": { "navigationBarTitleText": "变动明细", "enablePullDownRefresh": true } },
 		{ "path": "admin/home/edit", "style": { "navigationBarTitleText": "花店名称修改" } },
 		{"path": "common/success","style": {"navigationBarBackgroundColor": "#ffffff","navigationBarTextStyle": "black"}},