美团

hdApp/src/admin/order/fill-form.vue

@@ -2,11 +2,8 @@
   <div class="app-content">
     <form @submit="formSubmit">
       <app-delivery-module ref="appDelivery" />
-      <!-- 按钮 -->
       <div class="app-footer">
-        <button class="admin-button-com blue middle" formType="submit">
-          提交
-        </button>
+        <button class="admin-button-com blue middle" formType="submit"> 提交 </button>
       </div>
     </form>
   </div>

hdApp/src/admin/order/workOrder.vue

@@ -25,44 +25,50 @@
           <input v-model="form.num" placeholder-class="phcolor" class="tui-input" name="num" @focus="form.num=''" placeholder="请填写数量" maxlength="50" type="number" />
         </tui-list-cell>
 
+          <tui-list-cell class="line-cell" :hover="false" :arrow="false" >
+            <view class="tui-title">单价</view>
+            <input type="digit" @focus="goodsPrice=''" style="width:210upx;" :focus="true" v-model="goodsPrice" placeholder-class="tui-placeholder"/>
+            <text style="color:#333333;">合计 ¥<text>{{orderTotalPrice}}</text></text>
+          </tui-list-cell>
+
           <tui-list-cell class="line-cell" :hover="false" :arrow="false">
-            <view class="tui-title">结账方式</view>
+            <view class="tui-title">来源</view>
+            <button @tap="form.fromType = 3" class="admin-button-com mini-btn" :class="form.fromType == 3 ? 'blue' : 'default'">客服微信</button>
+            <button @tap="form.fromType = 4" class="admin-button-com mini-btn" :class="form.fromType == 4 ? 'blue' : 'default'">美团</button>
+          </tui-list-cell>
+
+          <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="form.fromType == 3">
+            <view class="tui-title">付款方式</view>
             <button @tap="form.hasPay = 1" class="admin-button-com mini-btn" :class="form.hasPay == 1 ? 'blue' : 'default'">已付款</button>
           </tui-list-cell>
 
-          <tui-list-cell class="line-cell" :arrow="true" v-if="form.hasPay == 1">
-            <view class="tui-title">收款方式</view>
+          <tui-list-cell class="line-cell" :arrow="true" v-if="form.hasPay == 1 && form.fromType == 3">
+            <view class="tui-title">付款选项</view>
             <picker mode="selector" :value="form.payWay" :range="payWayList" range-key="name" @change="payWayChange" class="tui-input" >
               <input v-model="form.payWay" name="payWay" type="text" hidden />
               <view style="padding:6upx 0 6upx 0;">{{payWayList[payWayindex].name}}</view>
             </picker>
           </tui-list-cell>
 
-          <tui-list-cell class="line-cell" :hover="false" :arrow="false">
-            <view class="tui-title">来源</view>
-            <button @tap="form.fromType = 3" class="admin-button-com mini-btn" :class="form.fromType == 3 ? 'blue' : 'default'">微信</button>
-            <button @tap="form.fromType = 4" class="admin-button-com mini-btn" :class="form.fromType == 4 ? 'blue' : 'default'">美团</button>
-            <button @tap="form.fromType = 1" class="admin-button-com mini-btn" :class="form.fromType == 1 ? 'blue' : 'default'">门店</button>
-          </tui-list-cell>
-
           <tui-list-cell class="line-cell" :hover="false" :arrow="false" >
-            <view class="tui-title">单价</view>
-            <input type="digit" @focus="goodsPrice=''" :focus="true" v-model="goodsPrice" placeholder-class="tui-placeholder"/>
+            <view class="tui-title">订金</view>
+            <input type="digit" @focus="dj=''" style="width:210upx;" v-model="dj" placeholder-class="tui-placeholder"/>
+            <text style="color:#333333;" v-if="Number(debtFinalPrice)>0">尾款 ¥<text>{{debtFinalPrice}}</text></text>
           </tui-list-cell>
 
         </view>
 
-      <view class="module-com input-line-wrap goods-wrap">
-        <view class="module-tit">
-          <span>图片</span>
-          <span class="app-color-3"></span>
-        </view>
-        <view class="module-det">
-          <htz-image-upload :max="1" :compress="true" v-model="currentImgData" :headers="headers"
-           @uploadSuccess="imgUploadSuccess" @imgDelete="imgDeleteFn" :action="getLoginInfo.imgUploadApi">
-          </htz-image-upload>
+        <view class="module-com input-line-wrap goods-wrap">
+          <view class="module-tit">
+            <span>图片</span>
+            <span class="app-color-3"></span>
+          </view>
+          <view class="module-det">
+            <htz-image-upload :max="1" :compress="true" v-model="currentImgData" :headers="headers"
+            @uploadSuccess="imgUploadSuccess" @imgDelete="imgDeleteFn" :action="getLoginInfo.imgUploadApi">
+            </htz-image-upload>
+          </view>
         </view>
-      </view>
 
         <app-delivery-module ref="appDelivery" @changeAddress="changeAddress" />
 
@@ -111,7 +117,8 @@ export default {
 			payWayList:[{name:"微信",id:0},{name:"支付宝",id:1},{name:"现金",id:4},{name:"银行卡",id:5}],
       plantClassData:[],
       categorySelectedData:{},
-      currentImgData:[]
+      currentImgData:[],
+      dj:''
     };
   },
   onLoad (option) {
@@ -124,7 +131,23 @@ export default {
 
 	},
   computed: {
-    ...mapGetters(["getLoginInfo"])
+    ...mapGetters(["getLoginInfo"]),
+    orderTotalPrice(){
+       let price = 0
+        if(Number(this.goodsPrice) > 0 && Number(this.form.num) >0 ){
+          price = Number(this.goodsPrice)*Number(this.form.num)
+          price = parseFloat(price.toFixed(2))
+        }
+        return price
+    },
+    debtFinalPrice(){
+      let price = 0
+      if(Number(this.dj) > 0 && Number(this.orderTotalPrice)){
+          price = Number(this.orderTotalPrice) - Number(this.dj)
+          price = parseFloat(price.toFixed(2))
+      }
+      return price
+    }
   },
   methods: {
     imgUploadSuccess(res) {
@@ -190,11 +213,24 @@ export default {
         this.$msg('请填写数量')
         return false
       }
+      if(Number(this.orderTotalPrice) == 0){
+        this.$msg('请填写单价')
+        return false
+      }
+      if(Number(this.dj) >= Number(this.orderTotalPrice)){
+        this.$msg('订金要小于总金额')
+        return false
+      }
       let modifyPrice = Number(this.goodsPrice)*Number(this.form.num)
       modifyPrice = modifyPrice.toFixed(2)
       that.form = {...that.$refs.appDelivery.form,...that.form}
+      console.log('that.form',that.form)
+      if(this.$util.isEmpty(that.form.bookName)){
+        this.$msg('请填写订花人姓名')
+        return false       
+      }
       that.$util.confirmModal({content:'确认提交？'},() => {
-          createOrder({...that.form,unitGoodsPrice:this.goodsPrice,modifyPrice:modifyPrice}).then((res) => {
+          createOrder({...that.form,unitGoodsPrice:this.goodsPrice,modifyPrice:modifyPrice,dj:this.dj}).then((res) => {
             that.pageTo({url: '/admin/order/workOrderResult',type:2,query:{id:res.data.id}})
           })
       })

hdApp/src/components/app-delivery.vue

@@ -3,21 +3,11 @@
 
     <view class="module-com">
 
-      <tui-list-cell class="line-cell" :hover="false" :arrow="true">
-        <view class="tui-title">配送时间</view>
-        <picker mode="date" :value="form.reachDate" @change="selTimeFn" class="tui-input">
-          <view v-if="form.reachDate">{{ form.reachDate }}</view>
-          <view class="tui-placeholder" v-else>请选择送达时间</view>
-        </picker>
-      </tui-list-cell>
-
-      <tui-list-cell class="line-cell" :hover="false" :arrow="false">
-        <view class="tui-title">配送时段</view>
-        <view class="delivery-time">
-          <button class="button-com" :class="[form.reachPeriod == 0 ? 'red' : 'default']" @click="timeTodaySelFn(0)" >上午</button>
-          <button class="button-com" :class="[form.reachPeriod == 1 ? 'red' : 'default']" @click="timeTodaySelFn(1)" >下午</button>
-          <button class="button-com" :class="[form.reachPeriod == 2 ? 'red' : 'default']" @click="timeTodaySelFn(2)" >晚上</button>
-        </view>
+      <tui-list-cell class="line-cell" :hover="false">
+        <view class="tui-title">配送方式</view>
+        <button @tap="form.sendType = 3" class="admin-button-com mini-btn" :class="form.sendType == 3 ? 'blue' : 'default'">跑腿</button>
+        <button @tap="form.sendType = 2" class="admin-button-com mini-btn" style="margin-left:30upx;" :class="form.sendType == 2 ? 'blue' : 'default'">自己送</button>
+        <button @tap="form.sendType = 1" class="admin-button-com mini-btn" style="margin-left:30upx;" :class="form.sendType == 1 ? 'blue' : 'default'">到店自取</button>
       </tui-list-cell>
 
       <tui-list-cell class="line-cell" :hover="false">
@@ -30,31 +20,52 @@
         <input v-model="form.bookMobile" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" type="number" name="bookMobile" placeholder="请填写手机号" />
       </tui-list-cell>
 
-      <tui-list-cell class="line-cell" :hover="false">
-        <view class="tui-title">收花人姓名</view>
-        <input v-model="form.receiveUserName" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" name="receiveUserName" placeholder="请填写姓名" />
-      </tui-list-cell>
+      <template v-if="form.sendType != 1">
 
-      <tui-list-cell class="line-cell" :hover="false">
-        <view class="tui-title">收花人手机号</view>
-        <input v-model="form.receiveMobile" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" type="number" name="receiveMobile" placeholder="请填写手机号" />
-      </tui-list-cell>
+        <tui-list-cell class="line-cell" :hover="false" :arrow="true">
+          <view class="tui-title">配送时间</view>
+          <picker mode="date" :value="form.reachDate" @change="selTimeFn" class="tui-input">
+            <view v-if="form.reachDate">{{ form.reachDate }}</view>
+            <view class="tui-placeholder" v-else>请选择送达时间</view>
+          </picker>
+        </tui-list-cell>
 
-      <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="selectCityFn">
-        <view class="tui-title">所在城市</view>
-        <view class="tui-input" v-if="form.province || form.city" >{{ form.province + '-' + form.city }}</view> <view class="tui-placeholder" v-else>请选择</view>
-      </tui-list-cell>
+        <tui-list-cell class="line-cell" :hover="false" :arrow="false">
+          <view class="tui-title">配送时段</view>
+          <view class="delivery-time">
+            <button class="button-com" :class="[form.reachPeriod == 0 ? 'red' : 'default']" @click="timeTodaySelFn(0)" >上午</button>
+            <button class="button-com" :class="[form.reachPeriod == 1 ? 'red' : 'default']" @click="timeTodaySelFn(1)" >下午</button>
+            <button class="button-com" :class="[form.reachPeriod == 2 ? 'red' : 'default']" @click="timeTodaySelFn(2)" >晚上</button>
+          </view>
+        </tui-list-cell>
 
-      <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="selRegionFn">
-        <view class="tui-title">详细地址</view>
-        <view class="tui-input" v-if="form.address">{{ form.address }}</view>
-        <view class="tui-placeholder" v-else>请填写地址</view>
-      </tui-list-cell>
+        <tui-list-cell class="line-cell" :hover="false">
+          <view class="tui-title">收花人姓名</view>
+          <input v-model="form.receiveUserName" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" name="receiveUserName" 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" placeholder-style="color:#ccc" 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.receiveMobile" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" type="number" name="receiveMobile" placeholder="请填写手机号" />
+        </tui-list-cell>
+
+        <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="selectCityFn">
+          <view class="tui-title">所在城市</view>
+          <view class="tui-input" v-if="form.province || form.city" >{{ form.province + '-' + form.city }}</view> <view class="tui-placeholder" v-else>请选择</view>
+        </tui-list-cell>
+
+        <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="selRegionFn">
+          <view class="tui-title">详细地址</view>
+          <view class="tui-input" v-if="form.address">{{ form.address }}</view>
+          <view class="tui-placeholder" v-else>请填写地址</view>
+        </tui-list-cell>
+
+        <tui-list-cell class="line-cell" :hover="false">
+          <view class="tui-title">门牌号</view>
+          <input v-model="form.floor" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" name="floor" placeholder="楼号门牌号（选填）" />
+        </tui-list-cell>
+
+      </template>
 
       <tui-list-cell class="line-cell" :hover="false">
         <view class="tui-title">贺卡</view>
@@ -65,18 +76,20 @@
       <tui-list-cell class="line-cell" v-if="form.needCard == 1" :hover="false">
         <view class="tui-title">贺卡内容</view>
         <input v-model="form.cardInfo" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" name="bookName" placeholder="请填写" />
-      </tui-list-cell>    
-
-      <tui-list-cell class="line-cell" :hover="false">
-        <view class="none-name-delivery flex-center" style="padding-left:0upx;">
-          <view class="tui-title">派送方式</view>
-          <checkbox-group @change="anonymityChange" style="padding-left:70upx;">
-          <checkbox class="ljd-checkbox" value="1" style="transform:scale(0.6,0.6)" id="noneNameText" ></checkbox>
-          <label for="noneNameText" class="none-name-text">匿名派送</label>
-          </checkbox-group>
-        </view>
       </tui-list-cell>
 
+      <template v-if="form.sendType != 1">
+        <tui-list-cell class="line-cell" :hover="false">
+          <view class="none-name-delivery flex-center" style="padding-left:0upx;">
+            <view class="tui-title">匿名派送</view>
+            <checkbox-group @change="anonymityChange" style="padding-left:70upx;">
+            <checkbox class="ljd-checkbox" value="1" style="transform:scale(0.6,0.6)" id="noneNameText" ></checkbox>
+            <label for="noneNameText" class="none-name-text">需要</label>
+            </checkbox-group>
+          </view>
+        </tui-list-cell>
+      </template>
+
     </view>
 
     <view class="module-com remark-wrap">
@@ -119,6 +132,7 @@ export default {
       region: [],
       showRegion: false,
       form: {
+        sendType:3,
         receiveUserName: "", // 收花人姓名；到店自提的姓名
         receiveMobile: "", // 收花人手机；到店自提的电话；
         province: "", // 收花人省份

hdApp/src/pagesShare/pay.vue

@@ -2,47 +2,24 @@
   <div class="app-content pay-wrap">
     <div class="delivery-wrap">
       <div class="shop-logo-wrap">
-        <div class="logo-img">
-          <img src="" alt mode="widthFix" />
-        </div>
+        <div class="logo-img"> <img src="" alt mode="widthFix" /> </div>
       </div>
       <div class="module-com pay-input-wrap">
-        <pay-input-module
-          :focus="inpFocus"
-          :num="amount"
-          @focusFn="focusFn"
-          @blurFn="blurFn"
-          @clickKey="clickKeyFn"
-        />
-        <div
-          v-if="!$util.isEmpty(shopUser) && shopUser.userAsset.balance && shopUser.userAsset.balance != '0.00'"
-          class="balance"
-        >
+        <pay-input-module :focus="inpFocus" :num="amount" @focusFn="focusFn" @blurFn="blurFn" @clickKey="clickKeyFn" />
+        <div v-if="!$util.isEmpty(shopUser) && shopUser.userAsset.balance && shopUser.userAsset.balance != '0.00'" class="balance" >
           <span>账户余额 ¥</span>
           <span class="app-size-30">{{ shopUser.userAsset.balance || 0 }}</span>
         </div>
       </div>
-      <div class="tit-bg_box">
-        以下选填
-      </div>
+      <div class="tit-bg_box"> 以下选填 </div>
       <app-delivery-module ref="appDelivery" :anonymity="0" />
       <div class="btn-wrap">
-        <button
-          class="button-com red"
-          @click="balancePayFn"
-        >余额支付</button>
+        <button class="button-com red" @click="balancePayFn" >余额支付</button>
         <button class="button-com green" @click="wexinPayFn">微信支付</button>
       </div>
     </div>
     <!-- 支付密码弹窗 -->
-    <modal-module
-      :show="passwordModal"
-      @cancel="modalCancel"
-      @click="passwordModalClick"
-      :maskClosable="false"
-      title="支付密码"
-      padding="30upx 30upx"
-    >
+    <modal-module :show="passwordModal" @cancel="modalCancel" @click="passwordModalClick" :maskClosable="false" title="支付密码" padding="30upx 30upx" >
       <template v-slot:content>
         <div class="app-modal-input-wrap">
           <div class="inp-list-line">
@@ -58,13 +35,7 @@
         </div>
       </template>
     </modal-module>
-    <alert-module
-      :show="setPassModal"
-      btnText="去设置"
-      btnColor="#FF2842"
-      padding="66upx 24upx 66upx 24upx"
-      @click="hideAlert"
-    >
+    <alert-module :show="setPassModal" btnText="去设置" btnColor="#FF2842" padding="66upx 24upx 66upx 24upx" @click="hideAlert" >
       <div class="go-login-module">
         <div>请先设置支付密码！</div>
       </div>
@@ -82,7 +53,6 @@ import ModalModule from "@/components/plugin/modal";
 import AppCouponSel from "@/components/app-coupon-sel";
 import AlertModule from "@/components/plugin/alert";
 import AppShareMask from "@/components/module/app-share-mask";
-import { isLogin } from "@/utils/util";
 import { isWxBrowser, isWxMiniapp } from "@/utils/common";
 import { share } from "@/mixins";
 import { fastPay } from "@/api/pay";
@@ -151,51 +121,13 @@ export default {
     isWxBrowser: isWxBrowser,
     isWxMiniapp: isWxMiniapp,
     specialInit() {
-      // // #ifdef H5
-      // // 微信二次分享
-      // let href = window.location.href;
-      // if (href.indexOf("from=singlemessage") > 0) {
-      //   location.href = `${
-      //     this.$constant.formal
-      //   }/#/pages/pay/index${this.$util.parse(this.option)}`;
-      //   return false;
-      // }
-      // // #endif
       if (this.option.pageType) {
         this.tabIndex = parseInt(this.option.pageType);
       }
-      
       getOrderShop().then(res => {
-      //   this.inpFocus = true;
         uni.setNavigationBarTitle({
           title: `您正在向【${res.shop.name}】付款`
         });
-        //没有登陆不取优惠
-        // if (isLogin()) {
-        //   this.$refs.couponSel._getUserDiscount().then(discountData => {
-        //     this.discountArr = discountData;
-        //   });
-        // }
-      // });
-      // if (isLogin()) {
-      //   getShopUser(true).then(res => {
-      //     // 设置分享
-      //     let shareParams = {
-      //       // #ifdef H5
-      //       title: "点我付款",
-      //       desc: "享随机优惠，最高20元",
-      //       imgUrl: `${this.$constant.imgUrl}/retail/pay/wxSharePay.jpg`,
-      //       pagePath: `${this.$constant.formal}/#/pages/pay/index?account=${res.sjId}&store=0&sourceType=3&fromType=2`,
-      //       // #endif
-      //       // #ifndef H5
-      //       title: "",
-      //       desc: "享随机优惠，最高20元",
-      //       imgUrl: `${this.$constant.imgUrl}/retail/pay/wxPay.png`,
-      //       pagePath: `/pages/pay/index?account=${res.sjId}&store=0&sourceType=3&fromType=2`
-      //       // #endif
-      //     };
-      //     this.jweixinFn(shareParams);
-      //   });
       })
     },
     _pay() {

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

@@ -14,7 +14,14 @@
                     <view :key="item.id" @tap="changePayWay(item.id)" v-for="item in payWayList" :class="[form.payWay===item.id?'active':'']"> {{item.name}} </view>  
                 </view>
             </view>
-          
+
+            <view class="select-item_box" v-if="form.hasPay == 1 && form.payWay == 0">
+                <view class="title">客服</view>
+                <view class="item-list_box">
+                    <view :key="item.id" @tap="changeGetStaff(item)" v-for="item in getStaffList" :class="[form.getStaffId===item.id?'active':'']"> {{item.name}} </view>  
+                </view>
+            </view>
+
             <view class="select-item_box">
                 <view class="title">打印小票</view>
                 <view class="item-list_box">
@@ -55,8 +62,13 @@
                 <text>￥<text>{{totalPrice}}</text></text>
             </view>
 
+            <view class="input-list">
+                <text style="color:green;">收现金</text>
+                <text>￥<text>30</text></text>
+            </view>
+
             <view class="input-list input-bottom" @click.stop="changeCheck(0)">
-                <text style="color:green;">实收金额</text>
+                <text style="color:green;">应付金额</text>
                 <text style="font-size: 10upx;color:green;" v-if="diffPrice > 0">优惠￥<text>{{diffPrice}}</text></text>
                 <text>￥<text :class="{selected:checkType == 0}">{{form.modifyPrice}}</text></text>
             </view>
@@ -89,11 +101,12 @@ export default {
                 sendCost:0,
                 labourCost:0,
                 modifyPrice:0,
+                getStaffId:0,
                 getStaffName:''
             },
             proceeds: '0',
             hasPayList:[ { name:'扫码', id:0, }, { name:'其它', id:1, }],
-            payWayList:[ { name:'微信', id:0 }, { name:'支付宝', id:1 }, { name:'现金', id:4 }, { name:'银行卡', id:5 },{name:'其它',id:9} ],
+            payWayList:[ { name:'客服微信', id:0 }, { name:'支付宝', id:1 }, { name:'现金', id:4 }, { name:'银行卡', id:5 },{name:'其它',id:9} ],
             currentInputType:'proceeds',
             totalMoney: 0,
             needPrintList:[ { name:'不需要', id:2 },{ name:'需要', id:1 } ],
@@ -152,6 +165,17 @@ export default {
     },
     mounted() {
         this.activeKeyboard()
+
+        getAllStaff().then(res=>{
+            if(res.code == 1){
+                this.getStaffList = res.data.list
+                if(!this.$util.isEmpty(this.getStaffList)){
+                    this.form.getStaffId = this.getStaffList[0].id
+                    this.form.getStaffName = this.getStaffList[0].name
+                }
+            }
+        })
+
     },
     methods: {
         changeNeedPrint(val){
@@ -243,7 +267,7 @@ export default {
     background-color: #ffffff;
     display: flex;
     width:80vw;
-    height: 95vh;
+    height: 99vh;
     .select-left {
         flex: 1;
         padding: 10upx;
@@ -302,7 +326,7 @@ export default {
     }
     .select-right {
         flex: 1;
-        padding: 10upx;
+        padding: 5upx 10upx 10upx 10upx;
         display: flex;
         flex-direction: column;
         & .input-list{