Merge branch 'zhongqi-quickOrder' of git.huaml.com:zhh/front-end 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()

ghsApp/src/pagesClient/member/modify.vue

@@ -107,6 +107,11 @@ export default {
 				}else{
 					this.couldNavigation = 1
 				}
+				let shop = res.data.shop?res.data.shop:[]
+				let city = shop.city ? shop.city : ''
+				let province = shop.province?shop.province:''
+				this.form.province = province
+				this.form.city = city
 			})
 		},
 		//省市联动

ghsApp/src/pagesOrder/detail.vue

@@ -17,8 +17,8 @@
 						<i @click.stop="navigateTo(detailInfo.lat,detailInfo.long,detailInfo.customName)" class="iconfont icondianhua"></i>
 					</view>
 				</view>
-				<button class="admin-button-com bule middle copy-address" style="position: absolute;top:98upx;right:28upx;" @click.stop="copyCustom(detailInfo)">复制地址</button>
-				<button class="admin-button-com default middle" style="position: absolute;top:98upx;right:210upx;" @click.stop="modifyAddress(detailInfo)">修改地址</button>
+				<button class="admin-button-com bule middle copy-address" style="position: absolute;top:98upx;right:10upx;" @click.stop="copyCustom(detailInfo)">复制地址</button>
+				<button class="admin-button-com bule middle" style="position: absolute;top:98upx;right:210upx;" @click.stop="modifyAddress(detailInfo)">修改地址</button>
 			</view>
 
 			<view class="flex-space title" v-if="Number(detailInfo.sendStatus)>-4">

ghsApp/src/pagesOrder/modify.vue

@@ -3,6 +3,8 @@
 		<form @submit="formSubmit">
 			<view class="module-com input-line-wrap">
 
+				<view style="background-color: white;font-size:36upx;font-weight:bold;padding:20upx 0 10upx 30upx;">修改本订单地址：</view>
+
 				<tui-list-cell class="line-cell" :hover="false" v-if="hasMap == 1">
 					<view class="tui-title">地址类型</view>
 					<button :class="[couldNavigation==1?'blue':'default']" class="admin-button-com middle" @click.stop="setStyle(1)" style="width:180upx;">支持导航</button>
@@ -26,11 +28,20 @@
 					<view class="tui-title">地址</view>
 					<input v-model="form.address" placeholder-class="phcolor" class="tui-input" name="address" placeholder="请填写地址" />
 				</tui-list-cell>
-				<tui-list-cell class="line-cell" :hover="false">
-					<view class="tui-title ">门牌</view>
-					<input v-model="form.floor" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="楼号门牌号，建议填写，方便查找"/>
-				</tui-list-cell>
+			<tui-list-cell class="line-cell" :hover="false">
+				<view class="tui-title ">门牌</view>
+				<input v-model="form.floor" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="楼号门牌号，建议填写，方便查找"/>
+			</tui-list-cell>
+
+			<view class="checkbox-wrap">
+				<label class="checkbox-label">
+					<checkbox v-model="syncDefaultAddress" :true-value="1" :false-value="0" color="#007AFF" style="margin-right: 10upx;"></checkbox>
+					<text>同步设为客户的默认地址</text>
+				</label>
 			</view>
+
+			
+		</view>
 			<view class="confirm-btn">
 				<button class="admin-button-com big blue" formType="submit">提交</button>
 			</view>
@@ -72,10 +83,11 @@ export default {
 				lat: 0,
 				long: 0
 			},
-			cityPickerValueDefault: [0, 0],
-			showRegion: false,
-			hasMap: 0,
-			couldNavigation:1
+		cityPickerValueDefault: [0, 0],
+		showRegion: false,
+		hasMap: 0,
+		couldNavigation:1,
+		syncDefaultAddress: 0
 		}
 	},
 	onLoad() {
@@ -140,20 +152,20 @@ export default {
 			const cityIndex = districtStr.indexOf('市');
 			this.form.dist = cityIndex !== -1 ? districtStr.substring(cityIndex + 1) : districtStr;
 		},
-		confirmFn() {
-			let that = this
-			this.form.id = this.option.id ? this.option.id : 0
-			this.form = {...this.form, ...this.region}
-			uni.showLoading({mask:true})
-			modifyAddress(this.form).then(res=>{
-				if(res.code == 1){
-					that.$msg('修改成功')
-					setTimeout(() => {
-						uni.navigateBack({})
-					}, 1200)
-				}
-			})
-		},
+	confirmFn() {
+		let that = this
+		this.form.id = this.option.id ? this.option.id : 0
+		this.form = {...this.form, ...this.region, syncDefaultAddress: this.syncDefaultAddress}
+		uni.showLoading()
+		modifyAddress(this.form).then(res=>{
+			if(res.code == 1){
+				that.$msg('修改成功')
+				setTimeout(() => {
+					uni.navigateBack({})
+				}, 1200)
+			}
+		})
+	},
 		formSubmit(e) {
 			let rules = [
 				{
@@ -211,4 +223,18 @@ export default {
 			width: 100%;
 		}
 	}
+	// 复选框
+	.checkbox-wrap {
+		padding: 20upx 30upx;
+		background-color: white;
+		border-bottom: 1px solid #f0f0f0;
+		display: flex;
+		justify-content: flex-end;
+		.checkbox-label {
+			display: flex;
+			align-items: center;
+			font-size: 36upx;
+			color: #333;
+		}
+	}
 </style>

ghsApp/src/pagesOrder/refund.vue

@@ -353,7 +353,7 @@ export default {
 		},
 		needCancelRemind(id){
 			let that = this
-			that.$util.confirmModal({content:'有结账单取消了才能退款？',okText:'去取消',cancelText:'不操作'},() => {
+			that.$util.confirmModal({content:'有结账单取消了才能退款，请点去取消',okText:'去取消',cancelText:'不操作'},() => {
 				that.$util.pageTo({url: '/admin/clear/customInfo?id='+id})
 			})
 		},

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/home/workbench.vue

@@ -30,6 +30,7 @@
               <view class="income-value-large">
                 <text class="income-number-large">{{ $util.numberFormat(data.todayData.income) }}</text>
               </view>
+              <view class="income-date-small">{{ currentDate }}</view>
             </view>
             <view class="stats-right">
               <view class="stat-item-vertical" @click.stop="pageTo({url:'/admin/custom/visit'})">
@@ -587,6 +588,7 @@ export default {
       urlNo:1,
       shortUrlList:[],
       unReadMsgNum:0, //未读消息数
+      currentDate: '', // 当前日期信息 如：12月26号 周五
     };
   },
   computed: {
@@ -607,9 +609,10 @@ export default {
     uni.stopPullDownRefresh();
   },
   onLoad(){
-			getWeixinId().then(res => {
-				this.getappIdList = res.data
-			})
+		getWeixinId().then(res => {
+			this.getappIdList = res.data
+		})
+		this.updateCurrentDate()
   },
   onShow () {
       this.unReadMsgNum = 0; // 重置未读消息数
@@ -1131,6 +1134,14 @@ export default {
           this.unReadMsgNum = res.data.msg_count
         }
       })
+    },
+    updateCurrentDate(){
+      const now = new Date()
+      const month = now.getMonth() + 1
+      const date = now.getDate()
+      const weekDays = ['星期天', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六']
+      const week = weekDays[now.getDay()]
+      this.currentDate = `${month}-${date} ${week}`
     }
   }
 };
@@ -1184,6 +1195,10 @@ export default {
       padding: 24upx 20upx;
       text-align: center;
       backdrop-filter: blur(10px);
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
       
       &:active {
         background: rgba(255, 255, 255, 0.2);
@@ -1208,6 +1223,13 @@ export default {
           line-height: 1;
         }
       }
+      
+      .income-date-small {
+        font-size: 24upx;
+        color: white;
+        margin-top: 35upx;
+        font-weight: bold;
+      }
     }
     
     .stats-right {

hdApp/src/admin/member/modify.vue

@@ -76,6 +76,11 @@ export default {
 		init() {
 			getHasMap().then(res=>{
 				this.hasMap = res.data.hasMap
+				let shop = res.data.shop?res.data.shop:[]
+				let city = shop.city ? shop.city : ''
+				let province = shop.province?shop.province:''
+				this.form.province = province
+				this.form.city = city
 			})
 		},
 		openAddres() {

hdApp/src/admin/order/components/app-delivery-modify.vue

@@ -5,7 +5,7 @@
 
       <tui-list-cell class="line-cell" :hover="false">
         <view class="tui-title">配送方式</view>
-        <button @tap="form.sendType = 3" class="admin-button-com middle" :class="form.sendType == 3 ? 'blue' : 'default'">骑手送</button>
+        <button @tap="form.sendType = 3" class="admin-button-com middle" :class="form.sendType == 3 ? 'blue' : 'default'">跑腿送</button>
         <button @tap="form.sendType = 2" class="admin-button-com middle" style="margin-left:13upx;" :class="form.sendType == 2 ? 'blue' : 'default'">自配送</button>
         <button @tap="form.sendType = 1" class="admin-button-com middle" style="margin-left:13upx;" :class="form.sendType == 1 ? 'blue' : 'default'">到店自取</button>
       </tui-list-cell>
@@ -284,6 +284,8 @@ export default {
 
           this.form.lat = newVal.lat
           this.form.long = newVal.long
+
+          this.form.sendType = newVal.sendType
         }
 			},
 			immediate:true

hdApp/src/admin/order/detail.vue

@@ -129,15 +129,15 @@
                 <text v-else>{{thisYear==orderInfo.reachDate.substr(0,4)?'':orderInfo.reachDate.substr(0,4)+'-'}}{{orderInfo.reachDate ? orderInfo.reachDate.substr(5,11):''}}</text>
                 <text class="ml-10">{{orderInfo.reachPeriod||''}}</text>
               </view>
-              <view class="price" v-if="orderInfo.cardInfo!=''">
-                <button @click="copyCard(orderInfo)" class="admin-button-com">复制贺卡内容</button>
-              </view>
             </view>
 
             <!-- 寄语信息 -->
             <view class="msg-list">
               <view class="label">贺卡内容：</view>
               <view class="value">{{ orderInfo.cardInfo || '' }}</view>
+              <view class="price" v-if="orderInfo.cardInfo!=''">
+                <button @click="copyCard(orderInfo)" class="admin-button-com middle">复制</button>
+              </view>
             </view>
 
             <!-- 订花人信息 -->
@@ -183,7 +183,7 @@
         <view class="module-tit">
           <text class="module-tit__text">订单信息</text>
           <view class="module-tit__actions" v-if="orderInfo.payStatus == 1 && orderInfo.forward == 0">
-            <text class="link-primary" @click.stop="goRefund()">发起售后</text>
+            <button class="admin-button-com middle" @click.stop="goRefund()">发起售后</button>
           </view>
         </view>
         <view class="module-det">
@@ -359,11 +359,11 @@
       <view class="flex-center"></view>
       <view class="operate-btn-wrap">
 
-        <button class="admin-button-com middle" @click.stop="sendWork(orderInfo)" v-if="orderInfo.payStatus == 1 && (orderInfo.hasWork == 0 || orderInfo.hasWork == 2)">通知制作</button>
-        <button class="admin-button-com middle" @click.stop="cancelFn(orderInfo)" v-if="orderInfo.status == 1"> 取消 </button>
-        <button class="admin-button-com middle" @click.stop="goScan(orderInfo)" v-if="orderInfo.status == 1"> 扫码收款 </button>
-        <button class="admin-button-com middle" v-if="orderInfo.sendStatus == -4 && orderInfo.status == 2" @click.stop="openExpressPage(orderInfo.id)">呼叫跑腿</button>
-        <button class="admin-button-com middle" @click.stop="printOrder(orderInfo)" v-if="orderInfo.payStatus == 1"> 打印 </button>
+        <button class="admin-button-com middle blue" @click.stop="sendWork(orderInfo)" v-if="orderInfo.payStatus == 1 && (orderInfo.hasWork == 0 || orderInfo.hasWork == 2)">通知制作</button>
+        <button class="admin-button-com middle blue" @click.stop="cancelFn(orderInfo)" v-if="orderInfo.status == 1"> 取消 </button>
+        <button class="admin-button-com middle blue" @click.stop="goScan(orderInfo)" v-if="orderInfo.status == 1"> 扫码收款 </button>
+        <button class="admin-button-com middle blue" v-if="orderInfo.sendStatus == -4 && orderInfo.status == 2" @click.stop="openExpressPage(orderInfo.id)">呼叫跑腿</button>
+        <button class="admin-button-com middle blue" @click.stop="printOrder(orderInfo)" v-if="orderInfo.payStatus == 1"> 打印 </button>
       </view>
     </view>
 

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;

hdApp/src/admin/shop/add.vue

@@ -93,13 +93,22 @@
 					<input v-model="form.floor" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="楼号门牌号" />
 				</tui-list-cell>
 
-				<tui-list-cell class="line-cell remark-wrap" :hover="false">
-					<view class="tui-title">简介</view>
-					<view class="tui-input">
-						<textarea v-model="form.introduction" class="tui-textarea remark" placeholder-class="phcolor" placeholder="请输入简介" />
-					</view>
-				</tui-list-cell>
-			</view>
+			<tui-list-cell class="line-cell remark-wrap" :hover="false">
+				<view class="tui-title">简介</view>
+				<view class="tui-input">
+					<textarea v-model="form.introduction" class="tui-textarea remark" placeholder-class="phcolor" placeholder="请输入简介" />
+				</view>
+			</tui-list-cell>
+
+			<tui-list-cell class="line-cell" :hover="false">
+				<view class="tui-title">充值赠送</view>
+				<view class="recharge-buttons">
+					<button class="admin-button-com big" :class="{blue: form.rechargeWeal == 0}" @click="updateRechargeWeal(0)">没有</button>
+					<button class="admin-button-com big" :class="{blue: form.rechargeWeal == 1}" @click="updateRechargeWeal(1)">送钱</button>
+					<button class="admin-button-com big" :class="{blue: form.rechargeWeal == 2}" @click="updateRechargeWeal(2)">送红包</button>
+				</view>
+			</tui-list-cell>
+		</view>
 
 			<view class="module-com input-line-wrap goods-wrap">
 				<view class="module-tit">
@@ -168,7 +177,8 @@ export default {
 				mobile: '',
 				img: [],
 				default:0,
-				superWx:[]
+				superWx:[],
+				rechargeWeal: 0
 			},
 			hasMap:0, // 是否具备地址功能 0不具备 1具备
 			showRegion: false,
@@ -202,10 +212,13 @@ export default {
 		init() {
 
 		},
-		defaultChange(e){
-			this.form.default = e.target.value ? 1 : 0
-		},
-		imgUploadSuccess(res) {
+	defaultChange(e){
+		this.form.default = e.target.value ? 1 : 0
+	},
+	updateRechargeWeal(value){
+		this.form.rechargeWeal = value
+	},
+	imgUploadSuccess(res) {
 			var imgReturn = JSON.parse(res.data)
 			if(imgReturn.code == 1){
 				this.currentImgData.push(imgReturn.data.smallUrl)
@@ -247,13 +260,14 @@ export default {
 						this.form.openEndTime = this.end_time
 					}
 
-					if(!this.$util.isEmpty(data.shortSuperWx)){
-						this.currentImgData.push(data.superWx)
-						this.form.superWx = [data.shortSuperWx]
-					}
-					this.hasMap = data.hasMap || 0
-					this.merchantName = data.merchantName||''
-				})
+				if(!this.$util.isEmpty(data.shortSuperWx)){
+					this.currentImgData.push(data.superWx)
+					this.form.superWx = [data.shortSuperWx]
+				}
+				this.hasMap = data.hasMap || 0
+				this.merchantName = data.merchantName||''
+				this.form.rechargeWeal = data.rechargeWeal || 0
+			})
 			}
 		},
 		openChange(e) {
@@ -414,4 +428,9 @@ export default {
 			width: 100%;
 		}
 	}
+	.recharge-buttons {
+		display: flex;
+		gap: 20upx;
+		flex-wrap: wrap;
+	}
 </style>

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,12 +25,12 @@
 						<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">
-								<button class="button-com red big" @click="goUserFn">去使用</button>
+								<button class="button-com red big" @click="goUserFn">使用</button>
 							</template>
 							<!-- 已使用 -->
 							<template v-else-if="item.status == 1">
@@ -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;