app 成功页改进

ghsApp/src/pages.json

@@ -11,7 +11,8 @@
 		{"path": "admin/home/mall","style": {"navigationBarTitleText": "商城"}},
 		{"path": "common/redirect","style": {"navigationBarTitleText": "加载中..."}},
 		{"path": "common/webview","style": {"navigationBarBackgroundColor": "#ffffff","navigationBarTextStyle": "black"}},
-		{"path": "common/pageSuccess","style": {"navigationBarBackgroundColor": "#ffffff","navigationBarTextStyle": "black"}}
+		{"path": "common/pageSuccess","style": {"navigationBarBackgroundColor": "#ffffff","navigationBarTextStyle": "black"}},
+		{"path": "common/success","style": {"navigationBarBackgroundColor": "#ffffff","navigationBarTextStyle": "black"}}
 	],
 	"subPackages": [
 		{

ghsApp/src/pagesArrears/details.vue

@@ -49,7 +49,7 @@
 				<button :class="['admin-button-com', 'blue']" @click="isModelFun" >收款</button>
 			</view>
 		</view>
-		<modal-module :show="isModel" @cancel="modalCancel" @click="affirm" :title="'收款'" color="#333" :size="32" padding="30upx 30upx" >
+		<modal-module :show="isModel" @click="affirm" :title="'收款'" color="#333" :size="32" padding="30upx 30upx" >
 			<template slot="customContent">
 				<view class="select-cmd_bx">
 					<view class="num_bx">
@@ -239,7 +239,7 @@ export default {
 		// 支付成功
 		async paySuccess(parameter) {
 			await clearOrderApi({...parameter,modifyPrice:this.modifyPrice});
-			this.pageTo({url:'/common/pageSuccess?title=收款成功', type: 2});
+			this.pageTo({url:'/common/success', type: 2,query:{titleType:3}});
 		},
 		payFail() {
 		}

ghsApp/src/pagesGys/details.vue

@@ -1,4 +1,5 @@
 <template>
+<view class="app-content">
 	<view class="order-page">
 		<view class="top-view">
 			<view class="top-row">
@@ -13,14 +14,7 @@
 		</view>
 		<view scroll-y class="shop-list">
 			<block v-if="!$util.isEmpty(detailsList)">
-				<DetailsItem
-					v-for="(item, index) in detailsList"
-					:key="index"
-					:info="item"
-					:isEdit="true"
-					:isCheck="item.checked"
-					@click="checkItemEvent"
-				></DetailsItem>
+				<DetailsItem v-for="(item, index) in detailsList" :key="index" :info="item" :isEdit="true" :isCheck="item.checked" @click="checkItemEvent" ></DetailsItem>
 			</block>
 			<block v-else>
 				<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(detailsList)" />
@@ -52,7 +46,7 @@
 			</view>
 		</view>
 
-		<modal-module :show="showClearModel" @cancel="modalCancel" @click="confirmClear" :title="'收款'" color="#333" :size="32" padding="30upx 30upx" >
+		<modal-module :show="showClearModel" @click="confirmClear" :title="'收款'" color="#333" :size="32" padding="30upx 30upx" >
 			<template slot="customContent">
 				<view class="select-cmd_bx">
 					<view class="num_bx">
@@ -65,6 +59,7 @@
 		</modal-module>
 
 	</view>
+</view>
 </template>
 <script>
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
@@ -192,41 +187,37 @@ export default {
 				this.showClearModel = false
 				return false
 			}
-			try {
-				if (this.$util.isEmpty(this.selectList)) {
-					this.$msg("请选择订单");
-					return;
-				}
-				if (this.$util.isEmpty(this.modifyPrice)) {
-					this.$msg("请填写实收金额");
-					return;
-				}
-				let ids = this.selectList.map(ele => {
-					return {id:ele.id};
-				});
-				let parameter = {
-					id:JSON.stringify(ids),
-					ghsId:this.ghsInfo.id,
-					modifyPrice:this.modifyPrice
-				}
-				let self = this;
-				uni.showModal({
-					title: '提示',
-					content: '确认提交？',
-					success: function (res) {
-						if (res.confirm) {
-							self.paySuccess(parameter)
-						}
+			if (this.$util.isEmpty(this.selectList)) {
+				this.$msg("请选择订单");
+				return;
+			}
+			if (this.$util.isEmpty(this.modifyPrice)) {
+				this.$msg("请填写实收金额");
+				return;
+			}
+			let ids = this.selectList.map(ele => {
+				return {id:ele.id};
+			});
+			let parameter = {
+				id:JSON.stringify(ids),
+				ghsId:this.ghsInfo.id,
+				modifyPrice:this.modifyPrice
+			}
+			let that = this;
+
+			uni.showModal({
+				title: '提示',
+				content: '确认提交？',
+				success: function (res) {
+					if (res.confirm) {
+						clearOrderApi(parameter).then(ret=>{
+							if(ret.code == 1){
+								that.pageTo({url:'/common/success', type: 2,query:{titleType:1}})
+							}
+						})
 					}
-				});
-			} catch (error) {}
-		},
-		// 支付成功
-		async paySuccess(parameter) {
-			await clearOrderApi(parameter);
-			this.pageTo({url:'/common/pageSuccess?title=结账成功', type: 2});
-		},
-		payFail() {
+				}
+			})
 		}
 	}
 };

ghsApp/src/pagesOrder/detail.vue

@@ -257,7 +257,6 @@ export default {
 							payWay:payWay,
 							modifyPrice:actPrice
 						}
-
 						uni.showModal({
 							title: "提示",
 							content: "确认结清欠款？",
@@ -266,7 +265,7 @@ export default {
 								if (res.confirm) {
 									clearOrderApi(params).then(res => {
 										if(res.code == 1) {
-											that.pageTo({url:'/common/pageSuccess?title=操作成功', type: 2});
+											that.pageTo({url:'/common/success', type: 2,query:{titleType:1}});
 										}
 									}).catch(err => {
 										console.log('err', err)

ghsApp/src/pagesOrder/refund.vue

@@ -232,7 +232,7 @@ export default {
 						refund(parameter).then(res => {
 							if(res.code == 1){
 								uni.hideLoading()
-								uni.navigateTo({url:'/common/pageSuccess?title=操作成功'})
+								uni.navigateTo({url:'/common/success',query:{titleType:1}})
 							}
 						})
 					}

ghsApp/src/pagesPurchase/components/pageSuccess.vue

@@ -163,11 +163,7 @@ export default {
 			})
 		},
 		goBackHome() {
-			this.$util.pageTo({
-				url: "/admin/home/workbench",
-				type: 4,
-				query: { tabIndex: 0 },
-			});
+			this.$util.pageTo({ url: "/admin/home/workbench", type: 3, query: { tabIndex: 0 }})
 		}
   },
 };

ghsApp/src/pagesPurchase/info.vue

@@ -257,7 +257,7 @@ export default {
 			}
 			clearOrderApi(paramData).then(res => {
 				if(res.code == 1) {
-					that.pageTo({url: '/common/pageSuccess?title=结账成功',type: 2})
+					that.pageTo({url: '/common/success',type: 2,query:{titleType:2}})
 				}
 			}).catch(err => {
 				console.log('err', err)