配送

ghsApp/src/admin/billing/affirm.vue

@@ -98,7 +98,7 @@
             <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;" @click="setSendType(2)" class="admin-button-com mini-btn" :class="form.sendType == 2 ? '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>
 

ghsPad/src/pages/home/components/nav.vue

@@ -29,10 +29,9 @@ export default {
     return {
       nav: [
         { name: "收银", page: "/pages/home/cash",flag:'casher'},
+        { name: "订单", page: "/pages/home/order",flag:'order'},
         { name: "关闭", page: "/pages/home/close",flag:'close'},
         { name: "退出", page: "/pages/home/logout",flag:'logout'},
-        { name: "零售", page: "/pages/home/retail",flag:'retail'}
-        //{ name: "订单", page: "/pages/home/order",flag:'order'},
         //{ name: "损耗", page: "/pages/home/waste",flag:'waste'},
       ],
       device:''

ghsPad/src/pages/home/components/orderInfo.vue

@@ -76,6 +76,7 @@
       <view :class="[orderInfo.status==1 || orderInfo.status==5 ? '' : 'active']" @click="printFn(orderInfo)">打印</view>
       <view :class="[orderInfo.status==1 ? 'active' : '']" @click="selectFn(orderInfo,0)">查微信</view>
       <view :class="[orderInfo.status==1 ? 'active' : '']" @click="cancelShow()">取消</view>
+      <view class="active" @click="openRetail()">零售</view>
     </view>
 
     <!-- 选数量金额 -->
@@ -159,6 +160,35 @@ export default {
 
 	},
   methods:{
+		openRetail(){
+			let type = uni.getSystemInfoSync().platform
+			if(type == 'android'){
+				if (plus.runtime.isApplicationExist({pname: 'huahuibao.hzgsy'})) {
+					let senddata = {}
+					//调用第三方app
+					plus.runtime.launchApplication({
+							pname: "huahuibao.hzgsy",
+							extra: senddata
+						},
+						(e)=> {
+							uni.showToast({ title: "打开失败", icon: "none" })
+						},
+					);
+				} else {
+					uni.showModal({
+						title: '提示',
+						content: '没有安装，请先下载安装',
+						success: function (res){
+						if (res.confirm){ 
+							plus.runtime.openURL('http://www.wixhb.com/main/app')
+						}
+						}
+					})
+				}
+			}else{
+				this.$msg('暂不支持打开')
+			}
+		},
     confirmLock(){
 
     },

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

@@ -1,6 +1,14 @@
 <template>
     <view class="app-select_customer">
         <view class="select-left">
+
+            <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">
                 <view class="title">收款方式</view>
                 <view class="item-list_box">
@@ -116,6 +124,7 @@ export default {
             //输入类型 0 实收金额 1 运费
             fillType:0,
             form:{
+                sendType:1,
                 hasPay: 0,
                 payWay:0,
                 needPrint:1,
@@ -133,6 +142,7 @@ export default {
                 dealPrice:0
             },
             proceeds: '0',
+            sendTypeList:[{name:'自取',id:1},{name:'出车',id:0},{name:'跑腿',id:2}],
             hasPayList:[{ name:'扫码', id:0, },{ name:'欠款', id:2, },{ name:'线下', id:1, }],
             payWayList:[{ name:'员工微信', id:0 }, { name:'员工支付宝', id:1 },{ name:'现金', id:4 },{name:'银行卡',id:5}],
             currentInputType:'proceeds',
@@ -190,6 +200,7 @@ export default {
             handler(val){
                 if(Number(val) == 1){
                     this.form.hasPay = 0
+                    this.form.sendType = 1
                     this.form.payWay = 0
                     this.form.needPrint = 1
                     this.form.groupName = ''
@@ -254,6 +265,9 @@ export default {
                 this.form.cash = 0
             }
         },
+        changeSendType(val){
+            this.form.sendType = val
+        },
         changeHasPay(val){
             this.$util.hitVoice()
             this.form.hasPay = val

ghsPad/src/pages/home/retail.vue

@@ -30,41 +30,12 @@ export default {
 		...mapGetters(["getLoginInfo"])
 	},
 	onLoad(){
-		this.openRetail()
+
 	},
 	methods: {
 		init(){
 			
-		},
-		openRetail(){
-			let type = uni.getSystemInfoSync().platform
-			if(type == 'android'){
-				if (plus.runtime.isApplicationExist({pname: 'huahuibao.hzgsy'})) {
-					let senddata = {}
-					//调用第三方app
-					plus.runtime.launchApplication({
-							pname: "huahuibao.hzgsy",
-							extra: senddata
-						},
-						(e)=> {
-							uni.showToast({ title: "打开失败", icon: "none" })
-						},
-					);
-				} else {
-					uni.showModal({
-						title: '提示',
-						content: '没有安装，请先下载安装',
-						success: function (res){
-						if (res.confirm){ 
-							plus.runtime.openURL('http://www.wixhb.com/main/app')
-						}
-						}
-					})
-				}
-			}else{
-				this.$msg('暂不支持打开')
-			}
-		},
+		}
 	}
 };
 </script>