Merge branch 'master' into zhongqi-quickOrder

ghsApp/src/admin/home/me.vue

@@ -149,7 +149,7 @@
             </tui-list-cell>
 
             <tui-list-cell @click="pageTo({ url: '/admin/shop/sk' })" class="line-cell" :hover="false" :arrow="true">
-              <view class="tui-title">更多设置</view>
+              <view class="tui-title">门店设置</view>
             </tui-list-cell>
 
             <tui-list-cell @click="pageTo({ url: '/admin/delivery/deliveryManage' })" class="line-cell" :hover="false" :arrow="true">

ghsApp/src/pages.json

@@ -219,7 +219,7 @@
 				{"path": "trumpet","style": {"navigationBarTitleText": "云音箱"}},
 				{"path": "changeShop","style": {"navigationBarTitleText": "管理商家"}},
 				{"path": "showShop","style": {"navigationBarTitleText": "营业商家"}},
-				{"path": "sk","style": {"navigationBarTitleText": "更多设置"}},
+				{"path": "sk","style": {"navigationBarTitleText": "门店设置"}},
 				{"path": "password","style": {"navigationBarTitleText": "密码修改"}},
 				{"path": "debtChange","style": {"navigationBarTitleText": "欠款变动记录"}},
 				{"path": "selectShop","style": {"navigationBarTitleText": "选择门店"}},

ghsApp/src/pagesClient/member/detail.vue

@@ -380,7 +380,7 @@ export default {
           }
         },
         {
-          name: "添加员工",
+          name: "帮加员工",
           img: `${this.$constant.imgUrl}/retail/member/tab-icon-4.png`,
           funtion: () => {
             this.addStaff()

hdApp/src/admin/home/me.vue

@@ -94,7 +94,7 @@
               <view class="category-title">⚙️ 门店设置</view>
               <view class="category-items">
                 <view class="menu-item" @click="pageTo({ url: '/admin/shop/sk' })">
-                  <text class="item-label">更多设置</text>
+                  <text class="item-label">门店设置</text>
                   <i class="iconfont iconxiangyou"></i>
                 </view>
                 <view class="menu-item" @click="pageTo({ url: '/admin/delivery/deliveryManage' })">

hdApp/src/admin/recharge/discount.vue

@@ -249,9 +249,7 @@ export default {
 					display: flex;
 					align-items: flex-start;
 					margin-bottom: 12upx;
-					padding: 8upx 12upx;
-					border-radius: 8upx;
-					transition: all 0.3s ease;
+					padding: 8upx 0upx;
 					
 					&:last-child {
 						margin-bottom: 0;
@@ -281,11 +279,7 @@ export default {
 						color: rgba(255, 255, 255, 0.85);
 					}
 					
-					&.highlight {
-						background: rgba(255, 107, 53, 0.15);
-						border: 1upx solid rgba(255, 183, 77, 0.3);
-						box-shadow: 0 0 12upx rgba(255, 107, 53, 0.2);
-						
+					&.highlight {					
 						.intro-tip-text {
 							color: #fff4e6;
 							font-weight:bold;

mallApp/src/components/module/app-activily-coupon.vue

@@ -33,7 +33,7 @@
 <script>
 import ModalModule from '@/components/plugin/modal'
 // api
-import { receiveGift } from '@/api/coupon'
+import { receiveGift } from '@/api/hb'
 export default {
 	name: 'app-activily-coupon',
 	components: {

mallApp/src/pages/hb/list.vue

@@ -25,8 +25,8 @@
 						<view class="list-det-right">
 							<view class="coupon-message">
 								<view class="title">红包</view>
-								<view class="shop">门店：好运鲜花批发</view>
-								<view class="date">有效至：{{ item.deadline | formatTime('YYYY-MM-DD') }}</view>
+								<view class="shop">好运鲜花批发</view>
+								<view class="date">有效期 {{ item.deadline | formatTime('YYYY-MM-DD') }}</view>
 							</view>
 							<!-- 未使用 -->
 							<template v-if="item.status == 0">
@@ -78,7 +78,7 @@ export default {
 					key: '0'
 				},
 				{
-					name: '使用记录',
+					name: '已使用',
 					value: 0,
 					key: '0'
 				},
@@ -131,7 +131,7 @@ export default {
 		},
 		// 去使用
 		goUserFn() {
-			this.$util.pageTo('/pages/pay/index')
+
 		}
 	}
 }
@@ -159,7 +159,7 @@ export default {
 							margin-bottom: 6upx;
 							font-size: 26upx;
 							.price {
-								font-size: 60upx;
+								font-size:50upx;
 								font-weight: bold;
 								line-height: 1;
 							}
@@ -180,8 +180,12 @@ export default {
 								color:#333;
 							}
 							.shop{
+								font-size:26upx;
 								margin-bottom: 5upx;
 							}
+							.date{
+								font-size:26upx;
+							}
 						}
 						.button-com {
 							padding-top: 15upx;