Merge branch 'master' into szq-fixBug

ghsApp/src/pagesArrears/details.vue

@@ -5,7 +5,7 @@
 			<view class="top-row">
 				<view class="info-item">
 					<image class="logo" :src="customInfo.smallAvatar"/>
-					<text class="name">{{ customInfo.name || "" }}{{device}} </text>
+					<text class="name">{{ customInfo.name || "" }}</text>
 				</view>
 				<DateSelect class="bar" top="0" @selectDateFn="selectDateFn" defaultShowName='时间' />
 			</view>
@@ -31,20 +31,9 @@
 				</view>
 			</template>
 			<view class="btn-view">
-				<button :class="['admin-button-com', 'blue']" @click="isModelFun">创建账单</button>
+				<button :class="['admin-button-com', 'blue']" @click="createOrder">创建账单</button>
 			</view>
 		</view>
-		<modal-module :show="isModel" @click="confirmData" :title="'确认金额'" color="#333" :size="32" padding="30upx 30upx" >
-			<template slot="customContent">
-				<view class="select-cmd_bx">
-					<view class="num_bx">
-						<view class="flex">金额：{{selectTotalAmount}}</view>
-						<view class="flex">实收：<input @focus="modifyPrice = null" v-model="modifyPrice" type="digit"/></view>
-						<view class="flex">优惠：{{(selectTotalAmount - modifyPrice).toFixed(2)}}</view>
-					</view>
-				</view>
-			</template>
-		</modal-module>
 	</view>
 </view>
 </template>
@@ -121,6 +110,13 @@ export default {
 		}
 	},
 	methods: {
+		createOrder(){
+			let that = this
+			let price = parseFloat(that.modifyPrice)
+			that.$util.confirmModal({content:'总金额'+price+'元，确认提交？'},() => {
+				that.confirmData()
+			})
+		},
 		payWayChange(e){
 			let index = e.detail.value
 			this.payWayindex = index
@@ -184,19 +180,15 @@ export default {
 				}
 			}
 		},
-		confirmData(val) {
-			if (val.index === 0) {
-				this.isModel = false;
-			} else {
-				let ids = this.selectList.map(ele => {
-					return {id:ele.id};
-				});
-				let parameter = {
-					id:JSON.stringify(ids),
-					customId:this.customInfo.id
-				}
-				this.paySuccess(parameter)
+		confirmData() {
+			let ids = this.selectList.map(ele => {
+				return {id:ele.id};
+			});
+			let parameter = {
+				id:JSON.stringify(ids),
+				customId:this.customInfo.id
 			}
+			this.paySuccess(parameter)			
 		},
 		batchEvent() {
 			try {
@@ -289,6 +281,7 @@ export default {
 		padding-bottom: 100upx;
 	}
 	.ios-bar-view {
+		bottom: 0;
 		display: flex;
 		justify-content: space-between;
 		align-items: center;

hdApp/src/admin/home/me.vue

@@ -79,11 +79,11 @@
             </tui-list-cell>
 
             <tui-list-cell @click="pageTo({ url: '/admin/shop/print' })" 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/shop/makePrint' })" 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/shop/trumpet' })" class="line-cell" :hover="false" :arrow="true">

hdApp/src/pages.json

@@ -180,7 +180,8 @@
 				{"path": "list","style": {"navigationBarTitleText": "门店"}},
 				{"path": "downloadCode","style": {"navigationBarTitleText": "收款码"}},
 				{"path": "add","style": {"navigationBarTitleText": ""}},
-				{"path": "print","style": {"navigationBarTitleText": "小票标签机设置"}},
+				{"path": "print","style": {"navigationBarTitleText": "前台小票标签机设置"}},
+				{"path": "makePrint","style": {"navigationBarTitleText": "操作台小票标签机设置"}},
 				{"path": "password","style": {"navigationBarTitleText": "修改密码"}},
 				{"path": "trumpet","style": {"navigationBarTitleText": "收款播报设置"}}
 			]