Browse Source

结账优化

shish 1 year ago
parent
commit
1eda4d7f69

File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/css/chunk-205145b2.b80369e9.css


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/css/chunk-27a145a8.d3b59b9b.css


+ 0 - 1
ghs/dist/shop/css/chunk-3c23c40b.68f9a03b.css

@@ -1 +0,0 @@
-.el-dialog .el-dialog__header[data-v-03175fda]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-03175fda]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-03175fda]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-03175fda]{font-size:18px}.el-dialog .el-dialog__body[data-v-03175fda]{padding:20px}.el-dialog .el-dialog__footer[data-v-03175fda]{padding-bottom:15px}.shop-list[data-v-03175fda]{height:100%}

File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/css/chunk-6e93d541.05b9bfff.css


+ 1 - 0
ghs/dist/shop/css/chunk-efb50a6c.7514f4cd.css

@@ -0,0 +1 @@
+.el-dialog .el-dialog__header[data-v-50eabccd]{padding:10px;text-align:center;border-bottom:1px solid #f7f7f7}.el-dialog .el-dialog__header .el-dialog__title[data-v-50eabccd]{font-size:15px;letter-spacing:.5px}.el-dialog .el-dialog__header .el-dialog__headerbtn[data-v-50eabccd]{top:13px}.el-dialog .el-dialog__header .el-dialog__headerbtn .el-dialog__close[data-v-50eabccd]{font-size:18px}.el-dialog .el-dialog__body[data-v-50eabccd]{padding:20px}.el-dialog .el-dialog__footer[data-v-50eabccd]{padding-bottom:15px}.shop-list[data-v-50eabccd]{height:100%}

+ 2 - 2
ghs/dist/shop/index.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><link rel="stylesheet" type="text/css" media="print" href="/print-lock.css"><title>销花宝</title><link href="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><link rel="stylesheet" type="text/css" media="print" href="/print-lock.css"><title>销花宝</title><link href="http://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="http://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="http://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="http://img.hzghd.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
 			body,
 			#app {
 				height: 100%;
@@ -43,4 +43,4 @@
 			.once .sub-title {
 				color: #ababab;
 				font-size: 12px;
-			}</style><link href="/css/app.ae6e08b6.css" rel="preload" as="style"><link href="/css/chunk-libs.ce660555.css" rel="preload" as="style"><link href="/js/app.47b51ef8.js" rel="preload" as="script"><link href="/js/chunk-libs.c536e65e.js" rel="preload" as="script"><link href="/css/chunk-libs.ce660555.css" rel="stylesheet"><link href="/css/app.ae6e08b6.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.wixhb.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.wixhb.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.wixhb.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.wixhb.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.wixhb.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.wixhb.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.wixhb.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.wixhb.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.wixhb.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.c536e65e.js"></script><script src="/js/app.47b51ef8.js"></script></body></html>
+			}</style><link href="/css/app.ae6e08b6.css" rel="preload" as="style"><link href="/css/chunk-libs.ce660555.css" rel="preload" as="style"><link href="/js/app.b79d70b7.js" rel="preload" as="script"><link href="/js/chunk-libs.c536e65e.js" rel="preload" as="script"><link href="/css/chunk-libs.ce660555.css" rel="stylesheet"><link href="/css/app.ae6e08b6.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="http://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="http://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="http://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="http://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="http://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="http://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="http://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="http://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="http://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="http://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="http://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="http://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.c536e65e.js"></script><script src="/js/app.b79d70b7.js"></script></body></html>

File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/app.47b51ef8.js


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/app.b79d70b7.js


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/chunk-205145b2.150d9fd1.js


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/chunk-27a145a8.5e5d6cb3.js


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/chunk-5b196d54.7d49fbc6.js


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/chunk-6e93d541.e75c4d90.js


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/chunk-efb50a6c.634d7651.js


+ 67 - 22
ghsApp/src/admin/clear/customInfo.vue

@@ -24,14 +24,25 @@
 						<button @click="copy(detailInfo.orderSn)" class="admin-button-com default" > 复制 </button>
 					</view>
 				</view>
+
 				<view class="order-info_box" v-if="detailInfo.status == 2">
 					<view>支付方式:</view>
 					<view>
-						{{ detailInfo.payWay==0?'微信':detailInfo.payWay==1?'支付宝':detailInfo.payWay==4?'现金':detailInfo.payWay==5?'银行卡':'--' }}
-						<text v-if="detailInfo.onlinePay == 1">(线下)</text>
+						{{ detailInfo.payWay==0?'微信':detailInfo.payWay==1?'支付宝':detailInfo.payWay==4?'现金':detailInfo.payWay==5?'银行卡':detailInfo.payWay==11?'抵扣':'--' }}
+						<text v-if="detailInfo.onlinePay == 1">
+							<text v-if="detailInfo.payWay==0 || detailInfo.payWay==1">(线下)</text>
+						</text>
 						<text v-else style="font-weight:bold;color:#3385ff;">(线上)</text>
 					</view>
 				</view>
+
+				<view class="order-info_box" v-if="detailInfo.status == 2 && detailInfo.payRemark!=''">
+					<view>支付说明:</view>
+					<view>
+						{{ detailInfo.payRemark }}
+					</view>
+				</view>
+
 				<view class="order-info_box">
 					<view>操作人员:</view>
 					<view>{{ detailInfo.operator }}</view>
@@ -123,6 +134,18 @@
 			<button class="admin-button-com default" v-if="detailInfo.status == 1" @click="inviteClear()">邀客户结账</button>
 			<!-- #endif -->
 		</view>
+
+		<uni-popup ref="clearConfirmRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
+			<view style="padding:30upx;">
+				<textarea v-model="payRemark" style="border:1upx solid #cccccc;height:100upx;font-size:28upx;margin-bottom:40upx;" placeholder="这里写备注说明..."></textarea>
+				<view style="font-size:34upx;font-weight:bold;margin-bottom:15upx;text-align: center;">确认客户通过<text style="color:blue;margin-left:15upx;margin-right:15upx;">{{ payName }}</text>付款?</view>
+				<view style="text-align:center;">
+					<button class="admin-button-com big default" style="margin:30upx auto 10upx auto;width:45%;" @click="cancelAdd()">取消</button>
+					<button class="admin-button-com big blue" style="margin:30upx auto 10upx 20upx;width:45%;" @click="confirmAdd()">确认</button>
+				</view>
+			</view>
+		</uni-popup>
+
 	</view>
 </template>
 <script>
@@ -145,12 +168,23 @@ export default {
 			form: { name: "" },
 			detailInfo: {},
 			loading: false,
-			title:'点击查账和结账'
+			title:'点击查账和结账',
+			payRemark:'',
+			payWay:0,
+			payName:''
 		};
 	},
 	computed: {
 		...mapGetters({ dictInfo:"getDictionariesInfo" })
 	},
+	onLoad() {
+
+		//返回上一页到客户详情页时,需要刷新
+		let pages = getCurrentPages();
+		let prevPage = pages[ pages.length - 2 ];
+		prevPage.$vm.needRefresh = 1
+
+	},
   	onShareAppMessage(res) {
 		return {
 			title: this.title,
@@ -195,27 +229,38 @@ export default {
 				})
 			})
 		},
-		customHasClear(info){
+		cancelAdd(){
+			this.$refs.clearConfirmRef.close()
+			this.payRemark = ''
+		},
+		confirmAdd(){
 			let that = this
-			that.$util.confirmModal({content:'确认客户已转账?'},() => {
-				uni.showActionSheet({
-					itemList: ['请选择收款方式:', '线下微信', '线下支付宝','现金','银行卡'],
-					success: function (respond) {
-						let currentIndex = respond.tapIndex
-						let inWay = [{name:"未选择",id:-1},{name:"微信",id:0},{name:"支付宝",id:1},{name:"现金",id:4},{name:"银行卡",id:5}]
-						if(currentIndex > 0){
-							let payWay = inWay[currentIndex].id
-							confirmClear({id:info.id,payWay:payWay}).then(res=>{
-								if(res.code == 1){
-									that.$msg('操作成功')
-									that.init()
-								}
-							})
-						}else{
-							that.$msg("请选择收款方式");
-						}
+			uni.showLoading({mask:true})	
+			confirmClear({id:this.detailInfo.id,payWay:this.payWay,payRemark:this.payRemark}).then(res=>{
+				uni.hideLoading()
+				if(res.code == 1){
+					that.$refs.clearConfirmRef.close()
+					that.$msg('操作成功')
+					that.init()
+				}
+			})
+		},
+		customHasClear(){
+			let that = this
+			uni.showActionSheet({
+				itemList: ['请选择收款方式:', '线下微信', '线下支付宝','现金','银行卡','抵扣'],
+				success: function (respond) {
+					let currentIndex = respond.tapIndex
+					let inWay = [{name:"未选择",id:-1},{name:"线下微信",id:0},{name:"线下支付宝",id:1},{name:"现金",id:4},{name:"银行卡",id:5},{name:"抵扣",id:11}]
+					if(currentIndex > 0){
+						let payWay = inWay[currentIndex].id
+						that.payWay = payWay
+						that.payName = inWay[currentIndex].name
+						that.$refs.clearConfirmRef.open('center')
+					}else{
+						that.$msg("请选择收款方式");
 					}
-				})
+				}
 			})
 		},
 		copy(val) {

+ 53 - 23
ghsApp/src/pagesArrears/clearResult.vue

@@ -18,6 +18,18 @@
 				<button class="admin-button-com big default" style="width:45vw;margin-top:40upx;" @click="goBackHome">返回</button>
 			</view>
 		</view>
+
+		<uni-popup ref="clearConfirmRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
+			<view style="padding:30upx;">
+				<textarea v-model="payRemark" style="border:1upx solid #cccccc;height:100upx;font-size:28upx;margin-bottom:40upx;" placeholder="这里写备注说明..."></textarea>
+				<view style="font-size:34upx;font-weight:bold;margin-bottom:15upx;text-align: center;">确认客户通过<text style="color:blue;margin-left:15upx;margin-right:15upx;">{{ payName }}</text>付款?</view>
+				<view style="text-align:center;">
+					<button class="admin-button-com big default" style="margin:30upx auto 10upx auto;width:45%;" @click="cancelAdd()">取消</button>
+					<button class="admin-button-com big blue" style="margin:30upx auto 10upx 20upx;width:45%;" @click="confirmAdd()">确认</button>
+				</view>
+			</view>
+		</uni-popup>
+
 	</view>
 </template>
 <script>
@@ -30,7 +42,10 @@ export default {
 		return {
 			title:'点击查账和结账',
 			customName:'',
-			hasNoticeCustom:0
+			hasNoticeCustom:0,
+			payRemark:'',
+			payWay:0,
+			payName:''
 		}
 	},
 	onShareAppMessage(res) {
@@ -89,31 +104,46 @@ export default {
 		goBackHome() {
 			uni.navigateBack({})
 		},
-		customHasClear(){
+		cancelAdd(){
+			this.$refs.clearConfirmRef.close()
+			this.payRemark = ''
+		},
+		confirmAdd(){
 			let that = this
-			that.$util.confirmModal({content:'确认客户已转账?'},() => {
+			uni.showLoading({mask:true})	
+			confirmClear({id:that.option.id,payWay:this.payWay,payRemark:this.payRemark}).then(res=>{
+				uni.hideLoading()
+				if(res.code == 1){
+					that.$refs.clearConfirmRef.close()
+					that.$msg('操作成功')
+					setTimeout(function(){
 
-				uni.showActionSheet({
-					itemList: ['请选择收款方式:', '线下微信', '线下支付宝','现金','银行卡'],
-					success: function (respond) {
-						let currentIndex = respond.tapIndex
-						let inWay = [{name:"未选择",id:-1},{name:"微信",id:0},{name:"支付宝",id:1},{name:"现金",id:4},{name:"银行卡",id:5}]
-						if(currentIndex > 0){
-							let payWay = inWay[currentIndex].id
-							confirmClear({id:that.option.id,payWay:payWay}).then(res=>{
-								if(res.code == 1){
-									that.$msg('操作成功')
-									setTimeout(function(){
-										uni.navigateBack()
-									},1500)
-								}
-							})							
-						}else{
-							that.$msg("请选择收款方式");
-						}
-					}
-				})
+						//返回上一页需要刷新
+						let pages = getCurrentPages();
+						let prevPage = pages[ pages.length - 2 ];
+						prevPage.$vm.needRefresh = 1
 
+						uni.navigateBack()
+					},1500)
+				}
+			})
+		},
+		customHasClear(){
+			let that = this
+			uni.showActionSheet({
+				itemList: ['请选择付款方式:', '线下微信', '线下支付宝','现金','银行卡','抵扣'],
+				success: function (respond) {
+					let currentIndex = respond.tapIndex
+					let inWay = [{name:"未选择",id:-1},{name:"线下微信",id:0},{name:"线下支付宝",id:1},{name:"现金",id:4},{name:"银行卡",id:5},{name:"抵扣",id:11}]
+					if(currentIndex > 0){
+						let payWay = inWay[currentIndex].id
+						that.payName = inWay[currentIndex].name
+						that.payWay = payWay
+						that.$refs.clearConfirmRef.open('center')
+					}else{
+						that.$msg("请选择付款方式")
+					}
+				}
 			})
 		},
 		goDetail(){

+ 8 - 1
ghsApp/src/pagesClient/member/detail.vue

@@ -226,7 +226,7 @@
         <div class="inp-list-line">
           <div class="line-label"></div>
           <div class="line-input">
-          <input type="text" style="text-align:center;margin-top:40upx;font-size:32upx;" v-model="rechargeRemark" class="inp-input" placeholder="这里写备注" />
+          <input type="text" style="text-align:center;margin-top:40upx;font-size:32upx;" v-model="rechargeRemark" class="inp-input" placeholder="这里写备注" />
           </div>
         </div>
 
@@ -315,6 +315,7 @@ export default {
       payWay:-1,
       rechargeType:0,
       title:'付款结账',
+      needRefresh:0
     };
   },
 	computed: {
@@ -337,6 +338,12 @@ export default {
   },
   onShow(){
 
+    //结账之后返回此页面时,此页面需要刷新
+    if(this.needRefresh == 1){
+      this.getUserDetail()
+      this.needRefresh = 0
+    }
+
   },
   methods: {
     downloadCode(){

Some files were not shown because too many files changed in this diff