Merge branch 'master' into zhongqi-delivery

ghsApp/src/admin/billing/affirm.vue

@@ -31,15 +31,17 @@
 
                       <text style="position: absolute;right:300upx;top:2upx;font-size:28upx;color:green;font-weight:bold;" v-if="item.bigCount > 0">¥{{ parseFloat((Number(item.bigCount)*Number(item.userPrice)).toFixed(2)) }}</text>
                       <text style="position: absolute;right:300upx;top:2upx;font-size:28upx;color:green;font-weight:bold;" v-else>¥{{ parseFloat((Number(item.smallCount)*Number(item.userPrice)).toFixed(2)) }}</text>
-                      <text v-if="showFinance==1" :class="[Number(item.avCost) > Number(item.userPrice) && item.bigCount > 0 ? 'warning-price' : 'normal-price']" style="position: absolute;right:0upx;top:55upx;font-size:24upx;font-weight:bold;width:350upx;text-align:right;">
-                        成本¥{{ item.avCost?parseFloat(item.avCost):0 }}<text style="margin-left:8upx;" v-if="Number(item.avCost) > Number(item.userPrice) && item.bigCount > 0">售价过低</text>
+                      <text v-if="showFinance==1" :class="[Number(item.avCost) > Number(item.userPrice) && item.bigCount > 0 ? 'warning-price' : 'normal-price']" style="position: absolute;right:0upx;top:55upx;font-size:26upx;font-weight:bold;width:380upx;text-align:right;">
+                        成本 ¥{{ item.avCost?parseFloat(item.avCost):0 }}
+                        <text style="margin-left:8upx;" v-if="Number(item.avCost) > Number(item.userPrice) && item.bigCount > 0">毛利 ¥{{ parseFloat((Number(item.userPrice)-Number(item.avCost)).toFixed(2)) }}</text>
+                        <text style="margin-left:8upx;" v-else>毛利 ¥{{ parseFloat((Number(item.userPrice)-Number(item.avCost)).toFixed(2)) }}</text>
                       </text>
 
                       <view class="open-bx" >
                         <i class="iconfont iconjian" @click="reduceItemFn(item)" v-if="item.bigCount > 0 || item.smallCount > 0"></i>
                         <text class="num" @click="showAddModelFn(item)">
-                          <text v-if="item.bigCount > 0" style="font-size:24upx;font-weight:bold;color:#3385ff;">{{ item.bigCount }}</text>
-                          <text v-if="item.smallCount > 0" style="font-size:24upx;">{{ item.smallCount }}</text>
+                          <text v-if="item.bigCount > 0" style="font-size:26upx;font-weight:bold;color:#3385ff;">{{ item.bigCount }}</text>
+                          <text v-if="item.smallCount > 0" style="font-size:26upx;">{{ item.smallCount }}</text>
                         </text>
                         <i class="iconfont iconzeng" @click="addItemFn(item)"></i>
                       </view>
@@ -62,9 +64,12 @@
             </view>
             <view class="summary-bar" v-if="hasFinance==1">
               <view class="operate-view"></view>
-              <view class="describe-view" style="color:#3385ff;font-weight:bold;font-size:30upx;">
-                  <text v-if="showFinance==1" @click="getMyFinance">成本 ¥{{ allCount.avCost }}，利润 ¥{{ parseFloat((Number(allPrice)-Number(allCount.avCost)).toFixed(2)) }}</text>
-                  <text v-else @click="getMyFinance">查看财务</text>
+              <view class="describe-view" style="color:#3385ff;font-weight:bold;font-size:32upx;">
+                  <text v-if="showFinance==1" @click="getMyFinance">
+                    成本 ¥{{ allCount.avCost }}，毛利 ¥{{ parseFloat((Number(allPrice)-Number(allCount.avCost)).toFixed(2)) }}
+                    <text style="margin-left:20upx;text-decoration:underline;">关闭财务</text>
+                  </text>
+                  <text v-else @click="getMyFinance" style="text-decoration:underline;">查看财务</text>
               </view>
             </view>
           </view>
@@ -148,7 +153,7 @@
 <block v-else>
   <tui-list-cell class="line-cell" :hover="false" :arrow="false">
     <view class="tui-title">配送方式</view>
-    <button style="margin-right:16upx;height:70upx;line-height:46upx;" @tap="setSendType(0)" class="admin-button-com mini-btn" :class="form.sendType == 0 ? 'blue' : 'default'">送货</button>
+    <button style="margin-right:16upx;height:70upx;line-height:46upx;" @tap="setSendType(0)" class="admin-button-com mini-btn" :class="form.sendType == 0 ? 'blue' : 'default'">配送</button>
     <button style="margin-right:16upx;height:70upx;line-height:46upx;" @tap="setSendType(1)" class="admin-button-com mini-btn" :class="form.sendType == 1 ? 'blue' : 'default'">自取</button>
     <button style="margin-right:16upx;height:70upx;line-height:46upx;" @click="setSendType(2)" class="admin-button-com mini-btn" :class="form.sendType == 2 ? 'blue' : 'default'">跑腿</button>
     <button style="margin-right:0upx;height:70upx;line-height:46upx;" @click="setSendType(3)" class="admin-button-com mini-btn" :class="form.sendType == 3 ? 'blue' : 'default'">物流</button>

ghsApp/src/admin/item/add.vue

@@ -53,7 +53,7 @@
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">库存不足</view>
-          <view class="tui-input">
+          <view>
             <button class="admin-button-com middle" :class="form.virtualStock == 0 ? 'blue' : 'default'" @click="virtualStockChange(0)">不要自动补充</button>
             <button class="admin-button-com middle" :class="form.virtualStock == 1 ? 'blue' : 'default'" @click="virtualStockChange(1)" style="margin-left:38upx;">需要自动补充</button>
           </view>
@@ -90,7 +90,7 @@
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">包装类型</view>
-          <view class="tui-input">
+          <view>
             <button class="admin-button-com middle" :class="form.ratioType == 0 ? 'blue' : 'default'" @click="ratioTypeChange(0)">固定支数</button>
             <button class="admin-button-com middle" :class="form.ratioType == 1 ? 'blue' : 'default'" @click="ratioTypeChange(1)" style="margin-left:40upx;">没有固定</button>
           </view>

ghsApp/src/admin/item/detail.vue

@@ -84,7 +84,7 @@
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">库存不足</view>
-          <view class="tui-input">
+          <view>
             <button class="admin-button-com middle" :class="form.virtualStock == 0 ? 'blue' : 'default'" @click="virtualStockChange(0)">不要自动补充</button>
             <button class="admin-button-com middle" :class="form.virtualStock == 1 ? 'blue' : 'default'" @click="virtualStockChange(1)" style="margin-left:38upx;">需要自动补充</button>
           </view>
@@ -129,7 +129,7 @@
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">包装类型</view>
-          <view class="tui-input">
+          <view>
             <button class="admin-button-com middle" :class="form.ratioType == 0 ? 'blue' : 'default'" @click="ratioTypeChange(0)">固定支数</button>
             <button class="admin-button-com middle" :class="form.ratioType == 1 ? 'blue' : 'default'" @click="ratioTypeChange(1)" style="margin-left:140upx;">没有固定</button>
           </view>
@@ -236,28 +236,28 @@
           </tui-list-cell>
 
           <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">线上状态</view>
+            <view class="tui-title">批发线上</view>
             <view class="switch_bx">
               <switch :checked="form.frontHide == 0 ? false : true" @change="frontHideChange" style="transform: scale(0.8,0.8)" />
-              <text v-if="form.frontHide == 0">批发端显示</text>
-              <text v-else>批发端隐藏</text>
+              <text v-if="form.frontHide == 0">显示</text>
+              <text v-else>隐藏</text>
             </view>
           </tui-list-cell>
 
           <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">线上状态</view>
+            <view class="tui-title">零售线上</view>
             <view class="switch_bx">
               <switch :checked="form.frontUse == 0 ? false : true" @change="frontUseChange" style="transform: scale(0.8,0.8)" />
-              <text v-if="form.frontUse == 0">零售端显示</text>
-              <text v-else>零售端隐藏</text>
+              <text v-if="form.frontUse == 0">显示</text>
+              <text v-else>隐藏</text>
             </view>
           </tui-list-cell>
 
           <tui-list-cell class="line-cell" :hover="false">
             <view class="tui-title">单独统计</view>
-            <view class="tui-input">
-              <button class="admin-button-com" :class="belongCost == 0 ? 'blue' : 'default'" @click="belongCostChange(0)">不要</button>
-              <button class="admin-button-com" :class="belongCost == 1 ? 'blue' : 'default'" @click="belongCostChange(1)" style="margin-left:50upx;">需要</button>
+            <view>
+              <button class="admin-button-com middle" :class="belongCost == 0 ? 'blue' : 'default'" @click="belongCostChange(0)">不要</button>
+              <button class="admin-button-com middle" :class="belongCost == 1 ? 'blue' : 'default'" @click="belongCostChange(1)" style="margin-left:60upx;">需要</button>
             </view>
           </tui-list-cell>
 

hdApp/src/admin/billing/affirm.vue

@@ -124,8 +124,8 @@
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
 						<view class="tui-title">收款方式</view>
-            <button style="margin-right:16upx;height:70upx;line-height:46upx;" @click="form.hasPay = 4" class="admin-button-com mini-btn" :class="form.hasPay == 4 ? 'blue' : 'default'">余额</button>
             <button style="margin-right:16upx;height:70upx;line-height:46upx;" @click="form.hasPay = 0" class="admin-button-com mini-btn" :class="form.hasPay == 0 ? 'blue' : 'default'">扫码</button>
+            <button style="margin-right:16upx;height:70upx;line-height:46upx;" @click="form.hasPay = 4" class="admin-button-com mini-btn" :class="form.hasPay == 4 ? 'blue' : 'default'">余额</button>
             <button style="margin-right:16upx;height:70upx;line-height:46upx;" @tap="form.hasPay = 1" class="admin-button-com mini-btn" :class="form.hasPay == 1 ? 'blue' : 'default'">线下</button>
             <button style="margin-right:0upx;height:70upx;line-height:46upx;" @click="form.hasPay = 2" class="admin-button-com mini-btn" :class="form.hasPay == 2 ? 'blue' : 'default'">赊账</button>
 					</tui-list-cell>
@@ -143,12 +143,18 @@
 
           <tui-list-cell class="line-cell" :hover="false" :arrow="false">
             <view class="tui-title">配送方式</view>
-            <button style="margin-right:16upx;height:70upx;line-height:46upx;" @tap="setSendType(0)" class="admin-button-com mini-btn" :class="form.sendType == 0 ? 'blue' : 'default'">送货</button>
             <button style="margin-right:16upx;height:70upx;line-height:46upx;" @tap="setSendType(1)" class="admin-button-com mini-btn" :class="form.sendType == 1 ? 'blue' : 'default'">自取</button>
+            <button style="margin-right:16upx;height:70upx;line-height:46upx;" @tap="setSendType(0)" class="admin-button-com mini-btn" :class="form.sendType == 0 ? 'blue' : 'default'">配送</button>
             <button style="margin-right:16upx;height:70upx;line-height:46upx;" @click="setSendType(2)" class="admin-button-com mini-btn" :class="form.sendType == 2 ? 'blue' : 'default'">跑腿</button>
             <button style="margin-right:0upx;height:70upx;line-height:46upx;" @click="setSendType(3)" class="admin-button-com mini-btn" :class="form.sendType == 3 ? 'blue' : 'default'">物流</button>
           </tui-list-cell>
 
+          <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="form.sendType == 1">
+            <view class="tui-title">取货状态</view>
+            <button @tap="form.getGoods = 1" class="admin-button-com middle" style="width:140upx;" :class="form.getGoods == 1? 'blue' : 'default'">已取货</button>
+            <button @click="form.getGoods = 0" class="admin-button-com middle" style="width:140upx;" :class="form.getGoods == 0 ? 'blue' : 'default'">未取货</button>
+          </tui-list-cell>
+
           <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="form.sendType == 2">
             <view class="tui-title">运费</view>
             <input type="digit" placeholder="请填写运费" v-model="form.sendCost" placeholder-class="tui-placeholder"/>
@@ -446,11 +452,11 @@ export default {
         receiveAddress: "",
         receiveLong: "",
         receiveLat: "",
-        sendType: 0,
+        sendType: 1,
         sendSide: "2",
         sendDate: "",
         reachDate: "",
-		reachPeriod: "12:00",
+		    reachPeriod: "12:00",
         historyDate:"",
         sendCost: "",
         customId: "",
@@ -459,6 +465,7 @@ export default {
         remark:"",
         payWay:0,
         needPrint:2,
+        getGoods:1,
         hasPay:0,
         getStaffName:'',
         dealPrice:0,
@@ -513,7 +520,7 @@ export default {
     }
 
     //默认欠款是首选项
-    this.form.hasPay = 4
+    this.form.hasPay = 0
     // 初始化支付方式索引
     this.payWayindex = 0
     // #ifdef APP-PLUS
@@ -1153,8 +1160,8 @@ console.log(params)
 	border-radius: 20upx 20upx 0 0;
 	display: flex;
 	flex-direction: column;
-	max-height: 94vh;
-	padding:0 0 120upx 0;
+	max-height: 99vh;
+	padding:0 0 110upx 0;
 }
 
 .popup-header {
@@ -1249,7 +1256,7 @@ console.log(params)
 
 .time-button {
 	width: calc(25% - 6upx);
-	height: 80upx;
+	height: 73upx;
 	display: flex;
 	align-items: center;
 	justify-content: center;

hdApp/src/admin/billing/affirmGhs.vue

@@ -261,7 +261,7 @@
 							<text :class="isFreeDelivery ? 'delivery-price-free' : 'delivery-price-normal'">¥ {{ form.sendCost }}</text>
 							<text v-if="isFreeDelivery" class="free-delivery-tag">【免跑腿费】</text>
 							<text v-if="showDeliveryPolicy" class="delivery-policy-link" @click="showDeliveryPolicyModal">
-								免费配送要求
+								免费配送条件
 							</text>
 						</view>
 					</tui-list-cell>

hdApp/src/admin/goods/result.vue

@@ -471,7 +471,7 @@ export default {
 
 .time-button {
 	width: calc(25% - 6upx);
-	height: 80upx;
+	height: 73upx;
 	display: flex;
 	align-items: center;
 	justify-content: center;

hdApp/src/admin/item/add.vue

@@ -94,7 +94,7 @@
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">包装类型</view>
-          <view class="tui-input">
+          <view>
             <button class="admin-button-com middle" :class="form.ratioType == 0 ? 'blue' : 'default'" @click="ratioTypeChange(0)">固定支数</button>
             <button class="admin-button-com middle" :class="form.ratioType == 1 ? 'blue' : 'default'" @click="ratioTypeChange(1)" style="margin-left:140upx;">没有固定</button>
           </view>

hdApp/src/admin/item/detail.vue

@@ -93,7 +93,7 @@
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">库存不足</view>
-          <view class="tui-input">
+          <view>
             <button class="admin-button-com middle" :class="form.virtualStock == 0 ? 'blue' : 'default'" @click="virtualStockChange(0)">不要自动补充</button>
             <button class="admin-button-com middle" :class="form.virtualStock == 1 ? 'blue' : 'default'" @click="virtualStockChange(1)" style="margin-left:38upx;">需要自动补充</button>
           </view>
@@ -138,7 +138,7 @@
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">包装类型</view>
-          <view class="tui-input">
+          <view>
             <button class="admin-button-com middle" :class="form.ratioType == 0 ? 'blue' : 'default'" @click="ratioTypeChange(0)">固定支数</button>
             <button class="admin-button-com middle" :class="form.ratioType == 1 ? 'blue' : 'default'" @click="ratioTypeChange(1)" style="margin-left:140upx;">没有固定</button>
           </view>
@@ -254,19 +254,19 @@
           </tui-list-cell>
 
           <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">线上状态</view>
+            <view class="tui-title">零售线上</view>
             <view class="switch_bx">
               <switch :checked="form.frontUse == 0 ? false : true" @change="frontUseChange" style="transform: scale(0.8,0.8)" />
-              <text v-if="form.frontUse == 0">零售端显示</text>
-              <text v-else>零售端隐藏</text>
+              <text v-if="form.frontUse == 0">显示</text>
+              <text v-else>隐藏</text>
             </view>
           </tui-list-cell>
 
           <tui-list-cell class="line-cell" :hover="false">
             <view class="tui-title">单独统计</view>
-            <view class="tui-input">
-              <button class="admin-button-com" :class="belongCost == 0 ? 'blue' : 'default'" @click="belongCostChange(0)">不要</button>
-              <button class="admin-button-com" :class="belongCost == 1 ? 'blue' : 'default'" @click="belongCostChange(1)" style="margin-left:50upx;">需要</button>
+            <view>
+              <button class="admin-button-com middle" :class="belongCost == 0 ? 'blue' : 'default'" @click="belongCostChange(0)">不要</button>
+              <button class="admin-button-com middle" :class="belongCost == 1 ? 'blue' : 'default'" @click="belongCostChange(1)" style="margin-left:60upx;">需要</button>
             </view>
           </tui-list-cell>
 

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

@@ -533,7 +533,7 @@ export default {
 
   .time-button {
     width: calc(25% - 6upx);
-    height: 80upx;
+    height: 73upx;
     display: flex;
     align-items: center;
     justify-content: center;

hdApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜",
     "appid" : "__UNI__4079DC1",
     "description" : "花店管家婆",
-    "versionName" : "2.1.7",
-    "versionCode" : 217,
+    "versionName" : "2.1.8",
+    "versionCode" : 218,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

hdPad/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜收银",
     "appid" : "__UNI__F6E7EA0",
     "description" : "花掌柜收银",
-    "versionName" : "1.8.6",
-    "versionCode" : 186,
+    "versionName" : "1.8.7",
+    "versionCode" : 187,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

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

@@ -8,8 +8,9 @@
                 </view>
                 <view v-if="Number(balance)>Number(form.modifyPrice)" style="color:blue;font-size:13upx;font-weight:bold;margin-bottom:7upx;">客户余额 ￥{{balance?parseFloat(balance):0}}，使用余额支付</view>
             </view>
-            <view class="select-item_box" v-if="form.hasPay == 1">
-                <view class="title">请选择</view>
+
+            <view class="select-item_box" v-if="form.hasPay == 1" style="border:1upx solid #CCCCCC;margin-bottom:15upx;">
+                <view class="title" style="margin-top:8upx;">请选择线下收款方式</view>
                 <view class="item-list_box">
                     <view :key="item.id" @tap="changePayWay(item.id)" v-for="item in payWayList" :class="[form.payWay===item.id?'active':'']"> {{item.name}} </view>  
                 </view>
@@ -19,10 +20,33 @@
                 <view class="title" style="padding-left:60upx;" @click.stop="changeCheck(3)">
                     金额：<text :class="{selected:checkType == 3}">{{form.cash}}</text> 
                     <text style="margin-left:20upx;color:green;" v-if="Number(zl)>0">找零 {{zl}}</text>
-                    <text style="margin-left:20upx;color:red;" v-if="Number(zl)<0">还差 {{-zl}}</text>
+                    <text style="margin-left:20upx;color:red;" v-if="Number(zl)<0">还差 {{-zl}}，可以使用微信支付宝付款</text>
+                </view>
+            </view>
+            <view class="select-item_box">
+                <view class="title">打印小票</view>
+                <view class="item-list_box">
+                    <view :key="item.id" @tap="changeNeedPrint(item.id)" v-for="item in needPrintList" :class="[form.needPrint===item.id?'active':'']"> {{item.name}} </view>     
+                </view>
+            </view>
+            <view class="select-item_box">
+                <view class="title">配送方式</view>
+                <view class="item-list_box">
+                    <view :key="item.id" @tap="changeSendType(item.id)" v-for="item in sendTypeList" :class="[form.sendType===item.id?'active':'']"> {{item.name}} </view>     
+                </view>
+            </view>
+            <view class="select-item_box" v-if="form.sendType == 1" style="border:1upx solid #CCCCCC;">
+                <view class="title" style="margin-top:8upx;">取货状态</view>
+                <view class="item-list_box">
+                    <view :key="item.id" @tap="changeGetGoods(item.id)" v-for="item in getGoodsList" :class="[form.getGoods===item.id?'active':'']"> {{item.name}} </view>     
+                </view>
+            </view>
+            <view class="select-item_box">
+                <view class="title">备注：</view>
+                <view class="inpup_box">
+                    <view><input type="text" v-model="form.remark" name="remark" /></view>
                 </view>
             </view>
-
             <view class="select-item_box">
                 <view class="title">开单人</view>
                 <view class="item-list_box">
@@ -37,13 +61,6 @@
                 </view>
             </view>
 
-            <view class="select-item_box">
-                <view class="title">打印小票</view>
-                <view class="item-list_box">
-                    <view :key="item.id" @tap="changeNeedPrint(item.id)" v-for="item in needPrintList" :class="[form.needPrint===item.id?'active':'']"> {{item.name}} </view>     
-                </view>
-            </view>
-
             <!--
             <view class="select-item_box" v-if="$util.isEmpty(groupInfo)">
                 <view class="title">如需保存此组合，请输入名称：</view>
@@ -53,13 +70,6 @@
             </view>
             -->
 
-            <view class="select-item_box">
-                <view class="title">备注：</view>
-                <view class="inpup_box">
-                    <view><input type="text" v-model="form.remark" name="remark" /></view>
-                </view>
-            </view>
-
         </view>
         <view class="line"></view>
         <view class="select-right">
@@ -138,6 +148,8 @@ export default {
                 hasPay: 0,
                 payWay:0,
                 needPrint:2,
+                sendType:1,
+                getGoods:1,
                 freight: '',
                 groupName:'',
                 remark:'',
@@ -149,7 +161,9 @@ export default {
                 shopAdminId:0,
                 shopAdminName:'',
                 cash:0,
-                dealPrice:0
+                dealPrice:0,
+                reachDate: "",
+		        reachPeriod: "12:00"
             },
             proceeds: '0',
             hasPayList:[ { name:'扫码', id:0, },{name:'余额',id:4},{ name:'赊账', id:2, },{ name:'线下', id:1, }],
@@ -157,6 +171,8 @@ export default {
             currentInputType:'proceeds',
             totalMoney: 0,
             needPrintList:[ { name:'不需要', id:2 },{ name:'需要', id:1 } ],
+            sendTypeList:[ { name:'自取', id:1 },{ name:'配送', id:0 },{ name:'跑腿', id:2},{ name:'物流', id:3}],
+            getGoodsList:[{name:'已取货',id:1},{name:'未取货',id:0}],
             getStaffList:[],
             shopAdminIdList:[],
             diffData:[],
@@ -225,6 +241,8 @@ export default {
                     this.form.sendCost = 0
                     this.form.labourCost = 0
                     this.form.dealPrice = 0
+                    this.form.sendType = 1
+                    this.form.getGoods = 1
 
                     //如果余额够使用余额支付
                     if(Number(this.balance)>Number(this.form.modifyPrice)){
@@ -301,6 +319,14 @@ export default {
             this.form.getStaffId = item.id
             this.form.getStaffName = item.name
         },
+        changeGetGoods(val){
+            this.$util.hitVoice()
+            this.form.getGoods = val
+        },
+        changeSendType(val){
+            this.$util.hitVoice()
+            this.form.sendType = val
+        },
         changeNeedPrint(val){
             this.$util.hitVoice()
             this.form.needPrint = val
@@ -421,10 +447,10 @@ export default {
 .app-select_customer {
     background-color: #ffffff;
     display: flex;
-    width:80vw;
+    width:90vw;
     height: 99vh;
     .select-left {
-        flex: 1;
+        flex: 4;
         padding: 10upx;
         overflow-y: auto;
         & .select-item_box {
@@ -489,7 +515,7 @@ export default {
         background-color: #eee;
     }
     .select-right {
-        flex: 1;
+        flex: 3;
         padding: 5upx 10upx 10upx 10upx;
         display: flex;
         flex-direction: column;

mallApp/src/pages/billing/affirmGhs.vue

@@ -42,33 +42,40 @@
 							<button class="admin-button-com big" :class="[form.sendType == 1 ? 'blue' : 'default']" style="width:180upx;"  @click="changeSendType(1)">到店自取</button>
 						</block>
 						<block v-else-if="account == 4609">
-							<button class="admin-button-com big" :class="[form.sendType == 2 ? 'blue' : 'default']" style="width:180upx;" @click="changeSendType(2)">请跑腿送</button>
+							<button class="admin-button-com big" :class="[form.sendType == 2 ? 'blue' : 'default']" style="width:180upx;" @click="changeSendType(2)">跑腿送货</button>
 							<button class="admin-button-com big" :class="[form.sendType == 1 ? 'blue' : 'default']" style="width:180upx;"  @click="changeSendType(1)">到店自取</button>
 						</block>
 						<block v-else-if="account == 27829">
 							<button class="admin-button-com big" :class="[form.sendType == 0 ? 'blue' : 'default']" style="width:180upx;"  @click="changeSendType(0)">送货上门</button>
-							<button class="admin-button-com big" :class="[form.sendType == 2 ? 'blue' : 'default']" style="width:180upx;" @click="changeSendType(2)">请跑腿送</button>
+							<button class="admin-button-com big" :class="[form.sendType == 2 ? 'blue' : 'default']" style="width:180upx;" @click="changeSendType(2)">跑腿送货</button>
 							<button class="admin-button-com big" :class="[form.sendType == 1 ? 'blue' : 'default']" style="width:180upx;"  @click="changeSendType(1)">到店自取</button>
 						</block>
 						<block v-else>
-							<button class="admin-button-com big" :class="[form.sendType == 2 ? 'blue' : 'default']" style="width:180upx;" @click="changeSendType(2)">请跑腿送</button>
+							<button class="admin-button-com big" :class="[form.sendType == 2 ? 'blue' : 'default']" style="width:180upx;" @click="changeSendType(2)">跑腿送货</button>
 							<button class="admin-button-com big" :class="[form.sendType == 1 ? 'blue' : 'default']" style="width:180upx;"  @click="changeSendType(1)">到店自取</button>
-							<button class="admin-button-com big" :class="[form.sendType == 0 ? 'blue' : 'default']" style="width:180upx;"  @click="changeSendType(0)">送货上门</button>
+							<!-- <button class="admin-button-com big" :class="[form.sendType == 0 ? 'blue' : 'default']" style="width:180upx;"  @click="changeSendType(0)">送货上门</button> -->
 						</block>
 					</tui-list-cell>
 
-					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
-						<view v-if="form.sendType == 0">
-							<text style="color: #3385FF;width:100%;">
-							在本店配送范围的，免配送货上门（楼下）。首次下单，请联系客服确认是否在配送范围
-							</text>
-						</view>				
-						<view v-if="form.sendType == 1">
-							<text v-if="account == 4805" style="color: #3385FF;width:100%;">
-							需要送货上门，运费另付，下单后请联系客服
-							</text>
-							<text v-else style="color: #3385FF;width:100%;">到店取货，没有配送费</text>
-						</view>
+				<tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="form.sendType == 0 || form.sendType == 1">
+					<view v-if="form.sendType == 0">
+						<text style="color: #3385FF;width:100%;">
+						在本店配送范围的，免配送货上门（楼下）。首次下单，请联系客服确认是否在配送范围
+						</text>
+					</view>				
+					<view v-if="form.sendType == 1">
+						<text v-if="account == 4805" style="color: #3385FF;width:100%;">
+						需要送货上门，运费另付，下单后请联系客服
+						</text>
+					</view>
+				</tui-list-cell>
+					<tui-list-cell class="line-cell" :hover="false" v-if="form.sendType == 2 || form.sendType == 0">
+						<div class="tui-title">收花人姓名</div>
+						<input v-model="form.receiveUserName" placeholder-class="phcolor" placeholder-style="color:#ccc" @blur="onInputBlur" class="tui-input" name="receiveUserName" placeholder="请填写姓名" />
+					</tui-list-cell>
+					<tui-list-cell class="line-cell" :hover="false" v-if="form.sendType == 2 || form.sendType == 0">
+						<div class="tui-title">收花人电话</div>
+						<input v-model="form.receiveMobile" placeholder-class="phcolor" placeholder-style="color:#ccc" @blur="onInputBlur" class="tui-input" name="receiveMobile" placeholder="请填写电话" type="number" />
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false" :arrow="true" v-if="form.sendType == 2 || form.sendType == 0" @click="modifyAddress">
 						<view class="tui-title">收花地址</view>
@@ -118,17 +125,19 @@
 					<block v-if="form.openIntraCity == 1">
 						<tui-list-cell class="line-cell" :hover="false" v-if="displaySendCost == true && Number(showDistance)>0">
 							<view class="tui-title">距离</view>
-							<text v-if="showDistance > 100" style="color: #3385FF">{{ (showDistance/1000).toFixed(1) }}公里</text>
-							<text v-else style="color: #3385FF">{{ showDistance }} 米</text>
+							<view>
+								<text v-if="showDistance > 100" style="color: #3385FF">{{ (showDistance/1000).toFixed(1) }}公里</text>
+								<text v-else style="color: #3385FF">{{ showDistance }} 米</text>
+								<text v-if="showDeliveryPolicy" class="delivery-policy-link" @click="showDeliveryPolicyModal">
+								免费配送条件
+								</text>
+							</view>
 						</tui-list-cell>
 						<tui-list-cell class="line-cell" :hover="false" v-if="displaySendCost == true">
 							<view class="tui-title">跑腿费</view>
 							<view>
 								<text :class="isFreeDelivery ? 'delivery-price-free' : 'delivery-price-normal'">¥ {{ form.sendCost }}</text>
 								<text v-if="isFreeDelivery" class="free-delivery-tag">【免跑腿费】</text>
-								<text v-if="showDeliveryPolicy" class="delivery-policy-link" @click="showDeliveryPolicyModal">
-									免费配送要求
-								</text>
 							</view>
 						</tui-list-cell>
 					</block>
@@ -288,7 +297,9 @@ export default {
 				packCost:0,
 				sendCost:0,
 				showAddress:'',
-				openIntraCity:0 // 是否支持跑腿送： 0不支持 1支持  2暂不可用
+				openIntraCity:0, // 是否支持跑腿送： 0不支持 1支持  2暂不可用
+				receiveUserName:'',
+				receiveMobile:''
 			},
 			userInfo:{},
 			shopInfo:{},
@@ -556,6 +567,13 @@ export default {
 					that.form.long = userInfo.long
 					that.form.lat = userInfo.lat
 					that.form.showAddress = userInfo.showAddress
+					that.form.receiveMobile = userInfo.mobile
+
+					let userName = userInfo.name?userInfo.name:''
+					if (/^\d+$/.test(userName)){
+							userName = '尾号'+userName.slice(-4)
+					}
+					that.form.receiveUserName = userName
 
 					if(!this.$util.isEmpty(userInfo.lat) && !this.$util.isEmpty(userInfo.long) && !this.$util.isEmpty(userInfo.address)){
 						this.validAddress = true
@@ -567,7 +585,6 @@ export default {
 					if(Number(openIntraCity) == 1 && that.form.sendType == 2 && this.validAddress == true){
 						that.getDeliveryQuotes()
 						const isFreeDelivery = that.checkFreeDelivery()
-						console.log('getUserInfo -- isFreeDelivery: ',isFreeDelivery)
 					}
 				}
 			}).catch(()=>{})
@@ -651,8 +668,6 @@ export default {
 				} else {
 					uni.showToast({ title: '没有跑腿可用', icon: 'none' })
 				}
-			}).catch(err => {
-				uni.showToast({ title: '没有获取到跑腿费', icon: 'none' })
 			})
 		},
 		// 选择跑腿平台
@@ -668,6 +683,16 @@ export default {
 			console.log('selectDelivery -- isFreeDelivery: ',isFreeDelivery)
 		},
 		confirmForm(){
+			if(this.form.sendType == 0 || this.form.sendType == 2){
+				if(this.$util.isEmpty(this.form.receiveMobile)){
+					this.$msg('请填写收花人手机号')
+					return false
+				}
+				if(this.$util.isEmpty(this.form.receiveUserName)){
+					this.$msg('请填写收花人名称')
+					return false
+				}
+			}
 			this.$util.confirmModal({content:'确认提交？'},() => {
 				this.submitMyForm()
 			})
@@ -910,7 +935,7 @@ export default {
 		flex: 1;
 		padding: 20upx;
 		background-color: #f0f2f6;
-		margin-bottom:90upx;
+		margin-bottom:120upx;
 		.commodity-view {
 			display: flex;
 			flex-direction: column;
@@ -1169,7 +1194,7 @@ export default {
 .delivery-policy-link {
 	color: rgb(201, 52, 52);
 	font-size: 32upx;
-	margin-left: 10upx;
+	margin-left: 30upx;
 	font-weight:bold;
 	text-decoration: underline;
 }

mallApp/src/pages/home/category.vue

@@ -23,8 +23,7 @@
 			<view 
 				v-for="(filterItem, filterIndex) in filterTabs" 
 				:key="filterIndex"
-				class="filter-tab-item"
-				:class="{ 'active': currentFilterTab === filterIndex }"
+        :class="[filterItem.value == 99 ? 'filter-tab-item-tb':'filter-tab-item',currentFilterTab === filterIndex?'active':'']"
 				@click="switchFilterTab(filterIndex)"
 			>
 				<text>{{ filterItem.name }}</text>
@@ -657,13 +656,36 @@ page {
 	display: flex;
 	align-items: center;
 	justify-content: center;
-	
 	&.active {
 		background-color: #ff4757;
 		color: #fff;
 		border-color: #ff4757;
 	}
-	
+	&:active {
+		opacity: 0.8;
+	}
+}
+.filter-tab-item-tb {
+	padding: 18upx 48upx;
+	border-radius: 50upx;
+	font-size: 29upx;
+	font-weight: bold;
+	color: #2196F3;
+	border: 2upx solid #2196F3;
+	background-color: transparent;
+	transition: all 0.3s ease;
+	white-space: nowrap;
+	min-width: 120upx;
+	text-align: center;
+	flex: 1;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	&.active {
+		background-color: #ff4757;
+		color: #fff;
+		border-color: #ff4757;
+	}
 	&:active {
 		opacity: 0.8;
 	}

mallApp/src/pages/order/buy.vue

@@ -7,6 +7,9 @@
         <view class="module-det">
           <app-list-module v-if="!$util.isEmpty(goodsInfo)" :info="goodsInfo" />
           <view class="shop-prompt">
+							<view class="operate-view" @click="modifyGoods">
+								<text class="iconfont icongouwuche"></text>返回修改
+							</view>
             <view>商品合计</view>
             <view>￥{{ goodsTotalPrice }}</view>
           </view>
@@ -15,7 +18,7 @@
 
       <view class="module-com input-line-wrap">
         <tui-list-cell class="line-cell" :hover="false" :arrow="false" >
-          <button class="admin-button-com big" :class="[form.sendType == 2 ? 'blue' : 'default']" style="width:180upx;margin-right:20upx;" @click="changeSendType(2)">请跑腿送</button>
+          <button class="admin-button-com big" :class="[form.sendType == 2 ? 'blue' : 'default']" style="width:180upx;margin-right:20upx;" @click="changeSendType(2)">跑腿送货</button>
           <button class="admin-button-com big" :class="[form.sendType == 1 ? 'blue' : 'default']" style="width:180upx;margin-right:20upx;"  @click="changeSendType(1)">到店自取</button>
         </tui-list-cell>
       </view>
@@ -133,6 +136,11 @@ export default {
     }
   },
   methods: {
+		modifyGoods() {
+			let account = this.option.account ? this.option.account : 0
+			let hdId = this.option.hdId ? this.option.hdId : 0
+			this.$util.pageTo({url:'/pages/home/category?account='+account+'&hdId='+hdId,type:2})
+		},
     init() {
       let goodsInfo = uni.getStorageSync("buyGoodsDetil") || {}
       this.isFreight = goodsInfo.freightType == 0 // True:收配送费  False:不收配送费(在配送范围内，不收配送费)。 --  freightType:运费计算方式，0按距离计算  1免运费(在配送范围内，不收配送费)
@@ -292,7 +300,7 @@ export default {
     .shop-prompt {
       display: flex;
       align-items: center;
-      justify-content: flex-end;
+      justify-content: flex-start;
       color: black;
       font-size:30upx;
       font-weight:bold;
@@ -302,6 +310,18 @@ export default {
         color: #ccc;
         margin-left: 10upx;
       }
+      .operate-view {
+        display: flex;
+        align-items: center;
+        color: #ff0000;
+        font-size:30upx;
+        font-weight:bold;
+        margin-right: auto;
+        .iconfont {
+          margin-right: 20upx;
+          font-size: 40upx;
+        }
+      }
     }
   }
   // 可选优惠

开发http/hdApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜",
     "appid" : "__UNI__4079DC1",
     "description" : "花店管家婆",
-    "versionName" : "2.1.7",
-    "versionCode" : 217,
+    "versionName" : "2.1.8",
+    "versionCode" : 218,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

开发http/hdPad/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜收银",
     "appid" : "__UNI__F6E7EA0",
     "description" : "花掌柜收银",
-    "versionName" : "1.8.6",
-    "versionCode" : 186,
+    "versionName" : "1.8.7",
+    "versionCode" : 187,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

开发https/hdApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜",
     "appid" : "__UNI__4079DC1",
     "description" : "花店管家婆",
-    "versionName" : "2.1.7",
-    "versionCode" : 217,
+    "versionName" : "2.1.8",
+    "versionCode" : 218,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

开发https/hdPad/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜收银",
     "appid" : "__UNI__F6E7EA0",
     "description" : "花掌柜收银",
-    "versionName" : "1.8.6",
-    "versionCode" : 186,
+    "versionName" : "1.8.7",
+    "versionCode" : 187,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

线上/hdApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜",
     "appid" : "__UNI__4079DC1",
     "description" : "花店管家婆",
-    "versionName" : "2.1.7",
-    "versionCode" : 217,
+    "versionName" : "2.1.8",
+    "versionCode" : 218,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

线上/hdPad/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜收银",
     "appid" : "__UNI__F6E7EA0",
     "description" : "花掌柜收银",
-    "versionName" : "1.8.6",
-    "versionCode" : 186,
+    "versionName" : "1.8.7",
+    "versionCode" : 187,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {