Parcourir la source

返回app时同时退出微信小程序

wangtao il y a 3 ans
Parent
commit
884f70e279
41 fichiers modifiés avec 4038 ajouts et 155 suppressions
  1. 120 0
      .history/pages/index/index_20220607143625.vue
  2. 120 0
      .history/pages/index/index_20220607144123.vue
  3. 120 0
      .history/pages/index/index_20220607144124.vue
  4. 120 0
      .history/pages/index/index_20220607144126.vue
  5. 267 0
      .history/pages/order/index_20220607143625.vue
  6. 267 0
      .history/pages/order/index_20220607143718.vue
  7. 271 0
      .history/pages/order/index_20220607143905.vue
  8. 271 0
      .history/pages/order/index_20220607143908.vue
  9. 271 0
      .history/pages/order/index_20220607143942.vue
  10. 271 0
      .history/pages/order/index_20220607144135.vue
  11. 271 0
      .history/pages/order/index_20220607144136.vue
  12. 166 0
      .history/pages/over/index_20220607143625.vue
  13. 170 0
      .history/pages/over/index_20220607143935.vue
  14. 170 0
      .history/pages/over/index_20220607143950.vue
  15. 170 0
      .history/pages/over/index_20220607143951.vue
  16. 170 0
      .history/pages/over/index_20220607143955.vue
  17. 170 0
      .history/pages/over/index_20220607144053.vue
  18. 170 0
      .history/pages/over/index_20220607144105.vue
  19. 169 0
      .history/pages/over/index_20220607144111.vue
  20. 169 0
      .history/pages/over/index_20220607144112.vue
  21. 5 1
      pages/order/index.vue
  22. 5 2
      pages/over/index.vue
  23. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  24. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  25. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  26. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/amount/index.js.map
  27. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  28. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map
  29. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/index.js.map
  30. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/over/index.js.map
  31. 17 17
      unpackage/dist/dev/mp-weixin/app.json
  32. 22 23
      unpackage/dist/dev/mp-weixin/common/main.js
  33. 1 1
      unpackage/dist/dev/mp-weixin/common/vendor.js
  34. 13 15
      unpackage/dist/dev/mp-weixin/pages/amount/index.js
  35. 13 15
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  36. 13 15
      unpackage/dist/dev/mp-weixin/pages/login/index.js
  37. 13 15
      unpackage/dist/dev/mp-weixin/pages/order/index.js
  38. 1 1
      unpackage/dist/dev/mp-weixin/pages/order/index.wxml
  39. 13 15
      unpackage/dist/dev/mp-weixin/pages/over/index.js
  40. 1 1
      unpackage/dist/dev/mp-weixin/pages/over/index.wxml
  41. 28 34
      unpackage/dist/dev/mp-weixin/project.config.json

+ 120 - 0
.history/pages/index/index_20220607143625.vue

@@ -0,0 +1,120 @@
+<template>
+  <div class="mianBox" v-if="state">
+    <van-row class="contentBox">
+     <van-row @tap="amount()" class="amount">
+        <image :src="require('../img/recharge.png')" class="amount_img" mode="widthFix" />
+        <van-col :span="24" class="amount_txt1 amount_txt">充值</van-col>
+        <!-- <van-col :span="24" class="amount_txt2 amount_txt">对余额进行充值</van-col> -->
+      </van-row>
+	  
+	  <van-toast id="van-toast" />
+	</van-row>
+  </div>
+</template>
+<script>
+	import Toast from '../../wxcomponents/vant/weapp/dist/toast/toast';
+	export default {
+		data() {
+			return {
+				state:false,
+				data:{}
+			}
+		},
+		onLoad(options) {
+			//Toast("该用户未暂未录入充值系统...")
+			// 对接app测试代码
+					// let userId ='0001T110000000002HBL'
+					// var  a = {
+					// 	money:1,
+					// 	channelId:null,
+					// 	userId:'0001T110000000002HBL',
+					// 	scene:3,
+					// 	openid:null
+					// }
+					// var options = {}
+					// options = a
+			if(JSON.stringify(options) !="{}"){
+				//app或扫码进入
+				//console.log("app进入")
+				options = JSON.stringify(options)
+				const data = JSON.parse(options)
+				if(data){
+					this.data={
+						money:data.money,
+						channelId:data.channelId,
+						userId:data.userId,
+						scene:data.scene,
+						openid:null,
+					}
+					uni.redirectTo({
+					    url: `../order/index?params=${JSON.stringify(data)}`
+					});
+				}
+			}else{
+				this.state = true
+				//微信小程序历史记录进入
+				//console.log("微信小程序历史记录进入")
+				this.data={
+					money:null,
+					channelId:null,
+					userId:null,
+					scene:2
+				}
+			}
+		},
+		methods: {
+			amount(){
+				let parmas = {
+					money:this.data.money,
+					channelId:this.data.channelId,
+					userId:this.data.userId,
+					scene:this.data.scene
+				}
+				if(this.data.money){
+					//console.log("app或扫码进入 -->授权页")
+					uni.navigateTo({
+					    url: `../login/index?params=${JSON.stringify(parmas)}`
+					});
+				}else{
+					//console.log("微信小程序历史记录进入 -->就选择充值金额页")
+					uni.navigateTo({
+					    url: `../amount/index?params=${JSON.stringify(parmas)}`
+					});
+				}
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+.mianBox{
+    height: 100%;
+    width: 100%;
+    color: #000;
+    padding-top: 20px;
+    box-sizing: border-box;
+    .contentBox{
+      width: 100%;
+      height: auto;
+      padding: 15px 20px;
+      box-sizing: border-box;
+      overflow: hidden;
+      .amount{
+		position: absolute;
+        width: 100%;
+        padding: 15px 20px;
+		box-sizing: border-box;
+        image{
+          width:100%;
+		  height:auto
+        }
+		.amount_txt{
+			margin-top:30px;
+			position: absolute;
+			left:26%;
+			color:#fff;
+		}
+      }
+    }
+}
+</style>
+

+ 120 - 0
.history/pages/index/index_20220607144123.vue

@@ -0,0 +1,120 @@
+<template>
+  <div class="mianBox" v-if="state">
+    <van-row class="contentBox">
+     <van-row @tap="amount()" class="amount">
+        <image :src="require('../img/recharge.png')" class="amount_img" mode="widthFix" />
+        <van-col :span="24" class="amount_txt1 amount_txt">充值</van-col>
+        <!-- <van-col :span="24" class="amount_txt2 amount_txt">对余额进行充值</van-col> -->
+      </van-row>
+	  
+	  <van-toast id="van-toast" />
+	</van-row>
+  </div>
+</template>
+<script>
+	import Toast from '../../wxcomponents/vant/weapp/dist/toast/toast';
+	export default {
+		data() {
+			return {
+				state:false,
+				data:{}
+			}
+		},
+		onLoad(options) {
+			//Toast("该用户未暂未录入充值系统...")
+			// 对接app测试代码
+					let userId ='0001T110000000002HBL'
+					var  a = {
+						money:1,
+						channelId:null,
+						userId:'0001T110000000002HBL',
+						scene:3,
+						openid:null
+					}
+					var options = {}
+					options = a
+			if(JSON.stringify(options) !="{}"){
+				//app或扫码进入
+				//console.log("app进入")
+				options = JSON.stringify(options)
+				const data = JSON.parse(options)
+				if(data){
+					this.data={
+						money:data.money,
+						channelId:data.channelId,
+						userId:data.userId,
+						scene:data.scene,
+						openid:null,
+					}
+					uni.redirectTo({
+					    url: `../order/index?params=${JSON.stringify(data)}`
+					});
+				}
+			}else{
+				this.state = true
+				//微信小程序历史记录进入
+				//console.log("微信小程序历史记录进入")
+				this.data={
+					money:null,
+					channelId:null,
+					userId:null,
+					scene:2
+				}
+			}
+		},
+		methods: {
+			amount(){
+				let parmas = {
+					money:this.data.money,
+					channelId:this.data.channelId,
+					userId:this.data.userId,
+					scene:this.data.scene
+				}
+				if(this.data.money){
+					//console.log("app或扫码进入 -->授权页")
+					uni.navigateTo({
+					    url: `../login/index?params=${JSON.stringify(parmas)}`
+					});
+				}else{
+					//console.log("微信小程序历史记录进入 -->就选择充值金额页")
+					uni.navigateTo({
+					    url: `../amount/index?params=${JSON.stringify(parmas)}`
+					});
+				}
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+.mianBox{
+    height: 100%;
+    width: 100%;
+    color: #000;
+    padding-top: 20px;
+    box-sizing: border-box;
+    .contentBox{
+      width: 100%;
+      height: auto;
+      padding: 15px 20px;
+      box-sizing: border-box;
+      overflow: hidden;
+      .amount{
+		position: absolute;
+        width: 100%;
+        padding: 15px 20px;
+		box-sizing: border-box;
+        image{
+          width:100%;
+		  height:auto
+        }
+		.amount_txt{
+			margin-top:30px;
+			position: absolute;
+			left:26%;
+			color:#fff;
+		}
+      }
+    }
+}
+</style>
+

+ 120 - 0
.history/pages/index/index_20220607144124.vue

@@ -0,0 +1,120 @@
+<template>
+  <div class="mianBox" v-if="state">
+    <van-row class="contentBox">
+     <van-row @tap="amount()" class="amount">
+        <image :src="require('../img/recharge.png')" class="amount_img" mode="widthFix" />
+        <van-col :span="24" class="amount_txt1 amount_txt">充值</van-col>
+        <!-- <van-col :span="24" class="amount_txt2 amount_txt">对余额进行充值</van-col> -->
+      </van-row>
+	  
+	  <van-toast id="van-toast" />
+	</van-row>
+  </div>
+</template>
+<script>
+	import Toast from '../../wxcomponents/vant/weapp/dist/toast/toast';
+	export default {
+		data() {
+			return {
+				state:false,
+				data:{}
+			}
+		},
+		onLoad(options) {
+			//Toast("该用户未暂未录入充值系统...")
+			// 对接app测试代码
+					let userId ='0001T110000000002HBL'
+					var  a = {
+						money:1,
+						channelId:null,
+						userId:'0001T110000000002HBL',
+						scene:3,
+						openid:null
+					}
+					var options = {}
+					options = a
+			if(JSON.stringify(options) !="{}"){
+				//app或扫码进入
+				//console.log("app进入")
+				options = JSON.stringify(options)
+				const data = JSON.parse(options)
+				if(data){
+					this.data={
+						money:data.money,
+						channelId:data.channelId,
+						userId:data.userId,
+						scene:data.scene,
+						openid:null,
+					}
+					uni.redirectTo({
+					    url: `../order/index?params=${JSON.stringify(data)}`
+					});
+				}
+			}else{
+				this.state = true
+				//微信小程序历史记录进入
+				//console.log("微信小程序历史记录进入")
+				this.data={
+					money:null,
+					channelId:null,
+					userId:null,
+					scene:2
+				}
+			}
+		},
+		methods: {
+			amount(){
+				let parmas = {
+					money:this.data.money,
+					channelId:this.data.channelId,
+					userId:this.data.userId,
+					scene:this.data.scene
+				}
+				if(this.data.money){
+					//console.log("app或扫码进入 -->授权页")
+					uni.navigateTo({
+					    url: `../login/index?params=${JSON.stringify(parmas)}`
+					});
+				}else{
+					//console.log("微信小程序历史记录进入 -->就选择充值金额页")
+					uni.navigateTo({
+					    url: `../amount/index?params=${JSON.stringify(parmas)}`
+					});
+				}
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+.mianBox{
+    height: 100%;
+    width: 100%;
+    color: #000;
+    padding-top: 20px;
+    box-sizing: border-box;
+    .contentBox{
+      width: 100%;
+      height: auto;
+      padding: 15px 20px;
+      box-sizing: border-box;
+      overflow: hidden;
+      .amount{
+		position: absolute;
+        width: 100%;
+        padding: 15px 20px;
+		box-sizing: border-box;
+        image{
+          width:100%;
+		  height:auto
+        }
+		.amount_txt{
+			margin-top:30px;
+			position: absolute;
+			left:26%;
+			color:#fff;
+		}
+      }
+    }
+}
+</style>
+

+ 120 - 0
.history/pages/index/index_20220607144126.vue

@@ -0,0 +1,120 @@
+<template>
+  <div class="mianBox" v-if="state">
+    <van-row class="contentBox">
+     <van-row @tap="amount()" class="amount">
+        <image :src="require('../img/recharge.png')" class="amount_img" mode="widthFix" />
+        <van-col :span="24" class="amount_txt1 amount_txt">充值</van-col>
+        <!-- <van-col :span="24" class="amount_txt2 amount_txt">对余额进行充值</van-col> -->
+      </van-row>
+	  
+	  <van-toast id="van-toast" />
+	</van-row>
+  </div>
+</template>
+<script>
+	import Toast from '../../wxcomponents/vant/weapp/dist/toast/toast';
+	export default {
+		data() {
+			return {
+				state:false,
+				data:{}
+			}
+		},
+		onLoad(options) {
+			//Toast("该用户未暂未录入充值系统...")
+			// 对接app测试代码
+					let userId ='0001T110000000002HBL'
+					var  a = {
+						money:1,
+						channelId:null,
+						userId:'0001T110000000002HBL',
+						scene:3,
+						openid:null
+					}
+					var options = {}
+					options = a
+			if(JSON.stringify(options) !="{}"){
+				//app或扫码进入
+				//console.log("app进入")
+				options = JSON.stringify(options)
+				const data = JSON.parse(options)
+				if(data){
+					this.data={
+						money:data.money,
+						channelId:data.channelId,
+						userId:data.userId,
+						scene:data.scene,
+						openid:null,
+					}
+					uni.redirectTo({
+					    url: `../order/index?params=${JSON.stringify(data)}`
+					});
+				}
+			}else{
+				this.state = true
+				//微信小程序历史记录进入
+				//console.log("微信小程序历史记录进入")
+				this.data={
+					money:null,
+					channelId:null,
+					userId:null,
+					scene:2
+				}
+			}
+		},
+		methods: {
+			amount(){
+				let parmas = {
+					money:this.data.money,
+					channelId:this.data.channelId,
+					userId:this.data.userId,
+					scene:this.data.scene
+				}
+				if(this.data.money){
+					//console.log("app或扫码进入 -->授权页")
+					uni.navigateTo({
+					    url: `../login/index?params=${JSON.stringify(parmas)}`
+					});
+				}else{
+					//console.log("微信小程序历史记录进入 -->就选择充值金额页")
+					uni.navigateTo({
+					    url: `../amount/index?params=${JSON.stringify(parmas)}`
+					});
+				}
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+.mianBox{
+    height: 100%;
+    width: 100%;
+    color: #000;
+    padding-top: 20px;
+    box-sizing: border-box;
+    .contentBox{
+      width: 100%;
+      height: auto;
+      padding: 15px 20px;
+      box-sizing: border-box;
+      overflow: hidden;
+      .amount{
+		position: absolute;
+        width: 100%;
+        padding: 15px 20px;
+		box-sizing: border-box;
+        image{
+          width:100%;
+		  height:auto
+        }
+		.amount_txt{
+			margin-top:30px;
+			position: absolute;
+			left:26%;
+			color:#fff;
+		}
+      }
+    }
+}
+</style>
+

+ 267 - 0
.history/pages/order/index_20220607143625.vue

@@ -0,0 +1,267 @@
+<template>
+  <div class="mianBox">
+    <van-row class="contentBox" v-if="loading">
+		<van-row>
+			<van-col span="24" class="logo"><van-image width="75" height="75" :src="require('../img/logo.png')" /></van-col>
+			<van-col span="24" class="introduce">中国东信智慧园区平台</van-col>
+			<van-col span="24" class="money">{{data.money}}</van-col>
+			<van-col span="24" class="order_money">订单金额(元)</van-col>
+		</van-row>
+		<div class="pay_wrap">
+			<van-button class="pay"  color="#F22E3C" @tap="pay">支付</van-button>
+			<button class="pay" open-type="launchApp" app-parameter="appData"  @error="launchAppError" v-if="data.userId">返回APP</button>
+			<!-- <button class="pay" open-type="launchApp" app-parameter="appData"  @error="launchAppError" >返回APP<navigator open-type="exit" target="miniProgram" style="margin:30px 0;display: block;">退出程序</navigator></button> -->
+		</div>
+		<van-toast id="van-toast" />
+		<!-- <van-overlay :show="show" @click="show = false" /> -->
+	</van-row>
+  </div>
+</template>
+<script>
+	import Toast from '../../wxcomponents/vant/weapp/dist/toast/toast';
+	import { requestPost, requestGet } from '@/utils/user.js';
+	export default {
+		data() {
+			return {
+				loading:false,
+				data:{
+					money:undefined,
+					openid:null,
+					app:false,
+				},
+				appData:{
+					errCOde:0,
+					errStr:null,
+					extMsg:"未支付",
+					extraData:"未支付",
+					openid:null,
+					transaction:null,
+					type:"WXLaunchMiniProgramReq.Resp"
+				}
+			}
+		},
+		onLoad(options) {
+			//console.log(options)
+			let _this = this
+			const data = JSON.parse(options.params)
+			_this.data = data
+			uni.getStorage({
+				key: 'openid',
+				success: function (res) {
+					_this.appData.openid = _this.data.openid
+					if(data.scene){
+						if(data.scene == "3"){
+							//console.log("app进入 -->支付页")
+							_this.data={
+								money:Number(data.money).toFixed(2),
+								channelId:data.channelId,
+								userId:data.userId,
+								scene:data.scene,
+								openid:res.data,
+								app:false,
+							}
+						}
+					}else{
+						//console.log("微信小程序历史记录进入 -->支付页")
+						_this.data={
+							money:data.money,
+							scene:'2',
+							channelId:'',
+							userId:null,
+							openid:data.openid,
+							app:false,
+						}
+					}
+					_this.loading = true
+					_this.data.app = false
+					_this.pay()
+					
+				},
+				fail: function (res) {
+					_this.loading = true
+				},
+			});
+			
+		},
+		methods: {
+			pay(){
+				let _this = this
+				if(_this.data.openid && _this.data.openid != 'null'  ){
+					if(_this.data.userId){//app用户充值
+						//console.log("app用户充值")
+						requestGet("dxtop/staff/one",
+							{
+								"id":_this.data.userId,
+							},
+						).then(res =>{
+							if(res[1].data.data){
+								requestPost("dxtop/order/callUnifiedPay",
+									{
+										"money": Number(_this.data.money).toFixed(2), 
+										"topPayType": "W06", 
+										"payType": "2", 
+										"channelId":_this.data.channelId,
+										"userId":res[1].data.data.sid,
+										"scene":_this.data.scene,
+										"openId":_this.data.openid,
+									}
+								).then(res2 => {
+									if(res2[1].data?.status == "ERROR"){
+										if(res2[1].data?.code == 500){
+											if(res2[1].data.msg == "acct参数错误"){
+												Toast("华为、Android10系统,需要开启微信的“浮窗”和“允许在其他上层应用上打开”这两个权限")
+											}else{
+												Toast(res2[1].data.msg)
+											}
+										}else{
+											Toast(res2[1].data.msg)
+										}
+										
+									}else{
+										if(res2[1].data){
+											let data = JSON.parse(res2[1].data.data)
+											uni.requestPayment({
+												timeStamp: data.timeStamp,
+												nonceStr: data.nonceStr,
+												package: data.package,
+												signType: data.signType,
+												paySign: data.paySign,
+												success: function (res3) {
+													//console.log('success:' + JSON.stringify(res));
+													uni.redirectTo({
+														url: `../over/index`
+													});
+												},
+												fail: function (err) {
+													//console.log('fail:' + JSON.stringify(err));
+													
+												}
+											});
+										}
+									}
+									
+								}).catch(err =>{
+								})
+							}else{
+								Toast("该用户未暂未录入充值系统...")
+							}
+						})
+					}else{
+						Toast("请使用'中国东信'APP途径进行充值")
+						
+					}
+					
+				}else{
+					//console.log("去授权页",JSON.stringify(_this.data))
+					uni.redirectTo({
+					    url: `../login/index?params=${JSON.stringify(this.data)}`
+					});
+				}
+				
+			}
+			
+		},
+		onShow(options){
+		}
+	}
+</script>
+<style lang="scss" scoped>
+.mianBox{
+    height: 100%;
+    width: 100%;
+    color: #000;
+    box-sizing: border-box;
+	background-color: #F2F6FC;
+	position: fixed;
+    .contentBox{
+		width: 100%;
+		height: auto;
+		padding: 15px 20px;
+		box-sizing: border-box;
+		overflow: hidden;
+		.logo{
+			/deep/ .van-image{
+				margin:0 auto;
+				display: block;
+			}
+		}
+		.introduce{
+			text-align: center;
+			color: #000;
+			display: block;
+			/deep/ .van-col{
+				font-size: 20;
+				margin-top:20px;
+				letter-spacing: 2px;
+			}
+		}
+		.money{
+			text-align: center;
+			color: #000;
+			/deep/ .van-col{
+				font-size: 30px;
+				margin-top: 10px;
+				font-weight: 700;
+			}
+		}
+		.order_money{
+			text-align: center;
+			color: #ccc;
+			display: block;
+			/deep/ .van-col{
+				font-size: 20;
+				margin-top:10px;
+				letter-spacing: 2px;
+			}
+		}
+		/deep/ .van-button{
+			border-radius: 6px;
+			width: 100% !important;
+			margin-top:25px;
+			letter-spacing: 2px;
+			font-size: 18px;
+			height: 50px;
+		}
+		.order_wrap{
+			width:95%;
+			padding:10px 20px 20px 20px;
+			box-sizing: border-box;
+			width:95%;
+			margin:20px 2.5%;
+			background-color: #fff;
+			border-radius: 6px;
+			box-shadow: 0 2px 12px 0 #ccc;
+			display: block;
+			/deep/ .van-col{
+				font-size: 16px;
+				color:#ccc;
+				margin-top:10px;
+				display: block;
+			}
+			/deep/ .left{
+				text-align: left;
+			}
+			/deep/ .right{
+				text-align: right;
+			}
+		}
+		.pay_wrap{
+			width:95%;
+			margin:70px 2.5% 0;
+			.pay{
+				height: 50px;
+				font-size: 18px;
+				border-radius: 10px;
+				margin-top:40px;
+			}
+		}
+		
+    }
+}
+.pay{
+	background:#F22E3C;
+	color:#fff;
+}
+</style>
+
+

+ 267 - 0
.history/pages/order/index_20220607143718.vue

@@ -0,0 +1,267 @@
+<template>
+  <div class="mianBox">
+    <van-row class="contentBox" v-if="loading">
+		<van-row>
+			<van-col span="24" class="logo"><van-image width="75" height="75" :src="require('../img/logo.png')" /></van-col>
+			<van-col span="24" class="introduce">中国东信智慧园区平台</van-col>
+			<van-col span="24" class="money">{{data.money}}</van-col>
+			<van-col span="24" class="order_money">订单金额(元)</van-col>
+		</van-row>
+		<div class="pay_wrap">
+			<van-button class="pay"  color="#F22E3C" @tap="pay">支付</van-button>
+			<button class="pay" open-type="launchApp" app-parameter="appData"  @error="launchAppError" class="" v-if="data.userId">返回APP</button>
+			<!-- <button class="pay" open-type="launchApp" app-parameter="appData"  @error="launchAppError" >返回APP<navigator open-type="exit" target="miniProgram" style="margin:30px 0;display: block;">退出程序</navigator></button> -->
+		</div>
+		<van-toast id="van-toast" />
+		<!-- <van-overlay :show="show" @click="show = false" /> -->
+	</van-row>
+  </div>
+</template>
+<script>
+	import Toast from '../../wxcomponents/vant/weapp/dist/toast/toast';
+	import { requestPost, requestGet } from '@/utils/user.js';
+	export default {
+		data() {
+			return {
+				loading:false,
+				data:{
+					money:undefined,
+					openid:null,
+					app:false,
+				},
+				appData:{
+					errCOde:0,
+					errStr:null,
+					extMsg:"未支付",
+					extraData:"未支付",
+					openid:null,
+					transaction:null,
+					type:"WXLaunchMiniProgramReq.Resp"
+				}
+			}
+		},
+		onLoad(options) {
+			//console.log(options)
+			let _this = this
+			const data = JSON.parse(options.params)
+			_this.data = data
+			uni.getStorage({
+				key: 'openid',
+				success: function (res) {
+					_this.appData.openid = _this.data.openid
+					if(data.scene){
+						if(data.scene == "3"){
+							//console.log("app进入 -->支付页")
+							_this.data={
+								money:Number(data.money).toFixed(2),
+								channelId:data.channelId,
+								userId:data.userId,
+								scene:data.scene,
+								openid:res.data,
+								app:false,
+							}
+						}
+					}else{
+						//console.log("微信小程序历史记录进入 -->支付页")
+						_this.data={
+							money:data.money,
+							scene:'2',
+							channelId:'',
+							userId:null,
+							openid:data.openid,
+							app:false,
+						}
+					}
+					_this.loading = true
+					_this.data.app = false
+					_this.pay()
+					
+				},
+				fail: function (res) {
+					_this.loading = true
+				},
+			});
+			
+		},
+		methods: {
+			pay(){
+				let _this = this
+				if(_this.data.openid && _this.data.openid != 'null'  ){
+					if(_this.data.userId){//app用户充值
+						//console.log("app用户充值")
+						requestGet("dxtop/staff/one",
+							{
+								"id":_this.data.userId,
+							},
+						).then(res =>{
+							if(res[1].data.data){
+								requestPost("dxtop/order/callUnifiedPay",
+									{
+										"money": Number(_this.data.money).toFixed(2), 
+										"topPayType": "W06", 
+										"payType": "2", 
+										"channelId":_this.data.channelId,
+										"userId":res[1].data.data.sid,
+										"scene":_this.data.scene,
+										"openId":_this.data.openid,
+									}
+								).then(res2 => {
+									if(res2[1].data?.status == "ERROR"){
+										if(res2[1].data?.code == 500){
+											if(res2[1].data.msg == "acct参数错误"){
+												Toast("华为、Android10系统,需要开启微信的“浮窗”和“允许在其他上层应用上打开”这两个权限")
+											}else{
+												Toast(res2[1].data.msg)
+											}
+										}else{
+											Toast(res2[1].data.msg)
+										}
+										
+									}else{
+										if(res2[1].data){
+											let data = JSON.parse(res2[1].data.data)
+											uni.requestPayment({
+												timeStamp: data.timeStamp,
+												nonceStr: data.nonceStr,
+												package: data.package,
+												signType: data.signType,
+												paySign: data.paySign,
+												success: function (res3) {
+													//console.log('success:' + JSON.stringify(res));
+													uni.redirectTo({
+														url: `../over/index`
+													});
+												},
+												fail: function (err) {
+													//console.log('fail:' + JSON.stringify(err));
+													
+												}
+											});
+										}
+									}
+									
+								}).catch(err =>{
+								})
+							}else{
+								Toast("该用户未暂未录入充值系统...")
+							}
+						})
+					}else{
+						Toast("请使用'中国东信'APP途径进行充值")
+						
+					}
+					
+				}else{
+					//console.log("去授权页",JSON.stringify(_this.data))
+					uni.redirectTo({
+					    url: `../login/index?params=${JSON.stringify(this.data)}`
+					});
+				}
+				
+			}
+			
+		},
+		onShow(options){
+		}
+	}
+</script>
+<style lang="scss" scoped>
+.mianBox{
+    height: 100%;
+    width: 100%;
+    color: #000;
+    box-sizing: border-box;
+	background-color: #F2F6FC;
+	position: fixed;
+    .contentBox{
+		width: 100%;
+		height: auto;
+		padding: 15px 20px;
+		box-sizing: border-box;
+		overflow: hidden;
+		.logo{
+			/deep/ .van-image{
+				margin:0 auto;
+				display: block;
+			}
+		}
+		.introduce{
+			text-align: center;
+			color: #000;
+			display: block;
+			/deep/ .van-col{
+				font-size: 20;
+				margin-top:20px;
+				letter-spacing: 2px;
+			}
+		}
+		.money{
+			text-align: center;
+			color: #000;
+			/deep/ .van-col{
+				font-size: 30px;
+				margin-top: 10px;
+				font-weight: 700;
+			}
+		}
+		.order_money{
+			text-align: center;
+			color: #ccc;
+			display: block;
+			/deep/ .van-col{
+				font-size: 20;
+				margin-top:10px;
+				letter-spacing: 2px;
+			}
+		}
+		/deep/ .van-button{
+			border-radius: 6px;
+			width: 100% !important;
+			margin-top:25px;
+			letter-spacing: 2px;
+			font-size: 18px;
+			height: 50px;
+		}
+		.order_wrap{
+			width:95%;
+			padding:10px 20px 20px 20px;
+			box-sizing: border-box;
+			width:95%;
+			margin:20px 2.5%;
+			background-color: #fff;
+			border-radius: 6px;
+			box-shadow: 0 2px 12px 0 #ccc;
+			display: block;
+			/deep/ .van-col{
+				font-size: 16px;
+				color:#ccc;
+				margin-top:10px;
+				display: block;
+			}
+			/deep/ .left{
+				text-align: left;
+			}
+			/deep/ .right{
+				text-align: right;
+			}
+		}
+		.pay_wrap{
+			width:95%;
+			margin:70px 2.5% 0;
+			.pay{
+				height: 50px;
+				font-size: 18px;
+				border-radius: 10px;
+				margin-top:40px;
+			}
+		}
+		
+    }
+}
+.pay{
+	background:#F22E3C;
+	color:#fff;
+}
+</style>
+
+

+ 271 - 0
.history/pages/order/index_20220607143905.vue

@@ -0,0 +1,271 @@
+<template>
+  <div class="mianBox">
+    <van-row class="contentBox" v-if="loading">
+		<van-row>
+			<van-col span="24" class="logo"><van-image width="75" height="75" :src="require('../img/logo.png')" /></van-col>
+			<van-col span="24" class="introduce">中国东信智慧园区平台</van-col>
+			<van-col span="24" class="money">{{data.money}}</van-col>
+			<van-col span="24" class="order_money">订单金额(元)</van-col>
+		</van-row>
+		<div class="pay_wrap">
+			<van-button class="pay"  color="#F22E3C" @tap="pay">支付</van-button>
+			<button class="pay" open-type="launchApp" app-parameter="appData"  @error="launchAppError" @click="closeXCX" v-if="data.userId">返回APP</button>
+			<!-- <button class="pay" open-type="launchApp" app-parameter="appData"  @error="launchAppError" >返回APP<navigator open-type="exit" target="miniProgram" style="margin:30px 0;display: block;">退出程序</navigator></button> -->
+		</div>
+		<van-toast id="van-toast" />
+		<!-- <van-overlay :show="show" @click="show = false" /> -->
+	</van-row>
+  </div>
+</template>
+<script>
+	import Toast from '../../wxcomponents/vant/weapp/dist/toast/toast';
+	import { requestPost, requestGet } from '@/utils/user.js';
+	export default {
+		data() {
+			return {
+				loading:false,
+				data:{
+					money:undefined,
+					openid:null,
+					app:false,
+				},
+				appData:{
+					errCOde:0,
+					errStr:null,
+					extMsg:"未支付",
+					extraData:"未支付",
+					openid:null,
+					transaction:null,
+					type:"WXLaunchMiniProgramReq.Resp"
+				}
+			}
+		},
+		onLoad(options) {
+			//console.log(options)
+			let _this = this
+			const data = JSON.parse(options.params)
+			_this.data = data
+			uni.getStorage({
+				key: 'openid',
+				success: function (res) {
+					_this.appData.openid = _this.data.openid
+					if(data.scene){
+						if(data.scene == "3"){
+							//console.log("app进入 -->支付页")
+							_this.data={
+								money:Number(data.money).toFixed(2),
+								channelId:data.channelId,
+								userId:data.userId,
+								scene:data.scene,
+								openid:res.data,
+								app:false,
+							}
+						}
+					}else{
+						//console.log("微信小程序历史记录进入 -->支付页")
+						_this.data={
+							money:data.money,
+							scene:'2',
+							channelId:'',
+							userId:null,
+							openid:data.openid,
+							app:false,
+						}
+					}
+					_this.loading = true
+					_this.data.app = false
+					_this.pay()
+					
+				},
+				fail: function (res) {
+					_this.loading = true
+				},
+			});
+			
+		},
+		methods: {
+			// 关闭小程序
+			closeXCX(){
+				wx.exitMiniProgram({success: (res) => {}})
+			},
+			pay(){
+				let _this = this
+				if(_this.data.openid && _this.data.openid != 'null'  ){
+					if(_this.data.userId){//app用户充值
+						//console.log("app用户充值")
+						requestGet("dxtop/staff/one",
+							{
+								"id":_this.data.userId,
+							},
+						).then(res =>{
+							if(res[1].data.data){
+								requestPost("dxtop/order/callUnifiedPay",
+									{
+										"money": Number(_this.data.money).toFixed(2), 
+										"topPayType": "W06", 
+										"payType": "2", 
+										"channelId":_this.data.channelId,
+										"userId":res[1].data.data.sid,
+										"scene":_this.data.scene,
+										"openId":_this.data.openid,
+									}
+								).then(res2 => {
+									if(res2[1].data?.status == "ERROR"){
+										if(res2[1].data?.code == 500){
+											if(res2[1].data.msg == "acct参数错误"){
+												Toast("华为、Android10系统,需要开启微信的“浮窗”和“允许在其他上层应用上打开”这两个权限")
+											}else{
+												Toast(res2[1].data.msg)
+											}
+										}else{
+											Toast(res2[1].data.msg)
+										}
+										
+									}else{
+										if(res2[1].data){
+											let data = JSON.parse(res2[1].data.data)
+											uni.requestPayment({
+												timeStamp: data.timeStamp,
+												nonceStr: data.nonceStr,
+												package: data.package,
+												signType: data.signType,
+												paySign: data.paySign,
+												success: function (res3) {
+													//console.log('success:' + JSON.stringify(res));
+													uni.redirectTo({
+														url: `../over/index`
+													});
+												},
+												fail: function (err) {
+													//console.log('fail:' + JSON.stringify(err));
+													
+												}
+											});
+										}
+									}
+									
+								}).catch(err =>{
+								})
+							}else{
+								Toast("该用户未暂未录入充值系统...")
+							}
+						})
+					}else{
+						Toast("请使用'中国东信'APP途径进行充值")
+						
+					}
+					
+				}else{
+					//console.log("去授权页",JSON.stringify(_this.data))
+					uni.redirectTo({
+					    url: `../login/index?params=${JSON.stringify(this.data)}`
+					});
+				}
+				
+			}
+			
+		},
+		onShow(options){
+		}
+	}
+</script>
+<style lang="scss" scoped>
+.mianBox{
+    height: 100%;
+    width: 100%;
+    color: #000;
+    box-sizing: border-box;
+	background-color: #F2F6FC;
+	position: fixed;
+    .contentBox{
+		width: 100%;
+		height: auto;
+		padding: 15px 20px;
+		box-sizing: border-box;
+		overflow: hidden;
+		.logo{
+			/deep/ .van-image{
+				margin:0 auto;
+				display: block;
+			}
+		}
+		.introduce{
+			text-align: center;
+			color: #000;
+			display: block;
+			/deep/ .van-col{
+				font-size: 20;
+				margin-top:20px;
+				letter-spacing: 2px;
+			}
+		}
+		.money{
+			text-align: center;
+			color: #000;
+			/deep/ .van-col{
+				font-size: 30px;
+				margin-top: 10px;
+				font-weight: 700;
+			}
+		}
+		.order_money{
+			text-align: center;
+			color: #ccc;
+			display: block;
+			/deep/ .van-col{
+				font-size: 20;
+				margin-top:10px;
+				letter-spacing: 2px;
+			}
+		}
+		/deep/ .van-button{
+			border-radius: 6px;
+			width: 100% !important;
+			margin-top:25px;
+			letter-spacing: 2px;
+			font-size: 18px;
+			height: 50px;
+		}
+		.order_wrap{
+			width:95%;
+			padding:10px 20px 20px 20px;
+			box-sizing: border-box;
+			width:95%;
+			margin:20px 2.5%;
+			background-color: #fff;
+			border-radius: 6px;
+			box-shadow: 0 2px 12px 0 #ccc;
+			display: block;
+			/deep/ .van-col{
+				font-size: 16px;
+				color:#ccc;
+				margin-top:10px;
+				display: block;
+			}
+			/deep/ .left{
+				text-align: left;
+			}
+			/deep/ .right{
+				text-align: right;
+			}
+		}
+		.pay_wrap{
+			width:95%;
+			margin:70px 2.5% 0;
+			.pay{
+				height: 50px;
+				font-size: 18px;
+				border-radius: 10px;
+				margin-top:40px;
+			}
+		}
+		
+    }
+}
+.pay{
+	background:#F22E3C;
+	color:#fff;
+}
+</style>
+
+

+ 271 - 0
.history/pages/order/index_20220607143908.vue

@@ -0,0 +1,271 @@
+<template>
+  <div class="mianBox">
+    <van-row class="contentBox" v-if="loading">
+		<van-row>
+			<van-col span="24" class="logo"><van-image width="75" height="75" :src="require('../img/logo.png')" /></van-col>
+			<van-col span="24" class="introduce">中国东信智慧园区平台</van-col>
+			<van-col span="24" class="money">{{data.money}}</van-col>
+			<van-col span="24" class="order_money">订单金额(元)</van-col>
+		</van-row>
+		<div class="pay_wrap">
+			<van-button class="pay"  color="#F22E3C" @tap="pay">支付</van-button>
+			<button class="pay" open-type="launchApp" app-parameter="appData"  @error="launchAppError" @click="closeXCX" v-if="data.userId">返回APP</button>
+			<!-- <button class="pay" open-type="launchApp" app-parameter="appData"  @error="launchAppError" >返回APP<navigator open-type="exit" target="miniProgram" style="margin:30px 0;display: block;">退出程序</navigator></button> -->
+		</div>
+		<van-toast id="van-toast" />
+		<!-- <van-overlay :show="show" @click="show = false" /> -->
+	</van-row>
+  </div>
+</template>
+<script>
+	import Toast from '../../wxcomponents/vant/weapp/dist/toast/toast';
+	import { requestPost, requestGet } from '@/utils/user.js';
+	export default {
+		data() {
+			return {
+				loading:false,
+				data:{
+					money:undefined,
+					openid:null,
+					app:false,
+				},
+				appData:{
+					errCOde:0,
+					errStr:null,
+					extMsg:"未支付",
+					extraData:"未支付",
+					openid:null,
+					transaction:null,
+					type:"WXLaunchMiniProgramReq.Resp"
+				}
+			}
+		},
+		onLoad(options) {
+			//console.log(options)
+			let _this = this
+			const data = JSON.parse(options.params)
+			_this.data = data
+			uni.getStorage({
+				key: 'openid',
+				success: function (res) {
+					_this.appData.openid = _this.data.openid
+					if(data.scene){
+						if(data.scene == "3"){
+							//console.log("app进入 -->支付页")
+							_this.data={
+								money:Number(data.money).toFixed(2),
+								channelId:data.channelId,
+								userId:data.userId,
+								scene:data.scene,
+								openid:res.data,
+								app:false,
+							}
+						}
+					}else{
+						//console.log("微信小程序历史记录进入 -->支付页")
+						_this.data={
+							money:data.money,
+							scene:'2',
+							channelId:'',
+							userId:null,
+							openid:data.openid,
+							app:false,
+						}
+					}
+					_this.loading = true
+					_this.data.app = false
+					_this.pay()
+					
+				},
+				fail: function (res) {
+					_this.loading = true
+				},
+			});
+			
+		},
+		methods: {
+			// 关闭小程序
+			closeXCX(){
+				wx.exitMiniProgram({success: (res) => {}})
+			},
+			pay(){
+				let _this = this
+				if(_this.data.openid && _this.data.openid != 'null'  ){
+					if(_this.data.userId){//app用户充值
+						//console.log("app用户充值")
+						requestGet("dxtop/staff/one",
+							{
+								"id":_this.data.userId,
+							},
+						).then(res =>{
+							if(res[1].data.data){
+								requestPost("dxtop/order/callUnifiedPay",
+									{
+										"money": Number(_this.data.money).toFixed(2), 
+										"topPayType": "W06", 
+										"payType": "2", 
+										"channelId":_this.data.channelId,
+										"userId":res[1].data.data.sid,
+										"scene":_this.data.scene,
+										"openId":_this.data.openid,
+									}
+								).then(res2 => {
+									if(res2[1].data?.status == "ERROR"){
+										if(res2[1].data?.code == 500){
+											if(res2[1].data.msg == "acct参数错误"){
+												Toast("华为、Android10系统,需要开启微信的“浮窗”和“允许在其他上层应用上打开”这两个权限")
+											}else{
+												Toast(res2[1].data.msg)
+											}
+										}else{
+											Toast(res2[1].data.msg)
+										}
+										
+									}else{
+										if(res2[1].data){
+											let data = JSON.parse(res2[1].data.data)
+											uni.requestPayment({
+												timeStamp: data.timeStamp,
+												nonceStr: data.nonceStr,
+												package: data.package,
+												signType: data.signType,
+												paySign: data.paySign,
+												success: function (res3) {
+													//console.log('success:' + JSON.stringify(res));
+													uni.redirectTo({
+														url: `../over/index`
+													});
+												},
+												fail: function (err) {
+													//console.log('fail:' + JSON.stringify(err));
+													
+												}
+											});
+										}
+									}
+									
+								}).catch(err =>{
+								})
+							}else{
+								Toast("该用户未暂未录入充值系统...")
+							}
+						})
+					}else{
+						Toast("请使用'中国东信'APP途径进行充值")
+						
+					}
+					
+				}else{
+					//console.log("去授权页",JSON.stringify(_this.data))
+					uni.redirectTo({
+					    url: `../login/index?params=${JSON.stringify(this.data)}`
+					});
+				}
+				
+			}
+			
+		},
+		onShow(options){
+		}
+	}
+</script>
+<style lang="scss" scoped>
+.mianBox{
+    height: 100%;
+    width: 100%;
+    color: #000;
+    box-sizing: border-box;
+	background-color: #F2F6FC;
+	position: fixed;
+    .contentBox{
+		width: 100%;
+		height: auto;
+		padding: 15px 20px;
+		box-sizing: border-box;
+		overflow: hidden;
+		.logo{
+			/deep/ .van-image{
+				margin:0 auto;
+				display: block;
+			}
+		}
+		.introduce{
+			text-align: center;
+			color: #000;
+			display: block;
+			/deep/ .van-col{
+				font-size: 20;
+				margin-top:20px;
+				letter-spacing: 2px;
+			}
+		}
+		.money{
+			text-align: center;
+			color: #000;
+			/deep/ .van-col{
+				font-size: 30px;
+				margin-top: 10px;
+				font-weight: 700;
+			}
+		}
+		.order_money{
+			text-align: center;
+			color: #ccc;
+			display: block;
+			/deep/ .van-col{
+				font-size: 20;
+				margin-top:10px;
+				letter-spacing: 2px;
+			}
+		}
+		/deep/ .van-button{
+			border-radius: 6px;
+			width: 100% !important;
+			margin-top:25px;
+			letter-spacing: 2px;
+			font-size: 18px;
+			height: 50px;
+		}
+		.order_wrap{
+			width:95%;
+			padding:10px 20px 20px 20px;
+			box-sizing: border-box;
+			width:95%;
+			margin:20px 2.5%;
+			background-color: #fff;
+			border-radius: 6px;
+			box-shadow: 0 2px 12px 0 #ccc;
+			display: block;
+			/deep/ .van-col{
+				font-size: 16px;
+				color:#ccc;
+				margin-top:10px;
+				display: block;
+			}
+			/deep/ .left{
+				text-align: left;
+			}
+			/deep/ .right{
+				text-align: right;
+			}
+		}
+		.pay_wrap{
+			width:95%;
+			margin:70px 2.5% 0;
+			.pay{
+				height: 50px;
+				font-size: 18px;
+				border-radius: 10px;
+				margin-top:40px;
+			}
+		}
+		
+    }
+}
+.pay{
+	background:#F22E3C;
+	color:#fff;
+}
+</style>
+
+

+ 271 - 0
.history/pages/order/index_20220607143942.vue

@@ -0,0 +1,271 @@
+<template>
+  <div class="mianBox">
+    <van-row class="contentBox" v-if="loading">
+		<van-row>
+			<van-col span="24" class="logo"><van-image width="75" height="75" :src="require('../img/logo.png')" /></van-col>
+			<van-col span="24" class="introduce">中国东信智慧园区平台</van-col>
+			<van-col span="24" class="money">{{data.money}}</van-col>
+			<van-col span="24" class="order_money">订单金额(元)</van-col>
+		</van-row>
+		<div class="pay_wrap">
+			<van-button class="pay"  color="#F22E3C" @tap="pay">支付</van-button>
+			<button class="pay" open-type="launchApp" app-parameter="appData"  @error="launchAppError" @click="closeXCX" v-if="data.userId">返回APP</button>
+			<!-- <button class="pay" open-type="launchApp" app-parameter="appData"  @error="launchAppError" >返回APP<navigator open-type="exit" target="miniProgram" style="margin:30px 0;display: block;">退出程序</navigator></button> -->
+		</div>
+		<van-toast id="van-toast" />
+		<!-- <van-overlay :show="show" @click="show = false" /> -->
+	</van-row>
+  </div>
+</template>
+<script>
+	import Toast from '../../wxcomponents/vant/weapp/dist/toast/toast';
+	import { requestPost, requestGet } from '@/utils/user.js';
+	export default {
+		data() {
+			return {
+				loading:false,
+				data:{
+					money:undefined,
+					openid:null,
+					app:false,
+				},
+				appData:{
+					errCOde:0,
+					errStr:null,
+					extMsg:"未支付",
+					extraData:"未支付",
+					openid:null,
+					transaction:null,
+					type:"WXLaunchMiniProgramReq.Resp"
+				}
+			}
+		},
+		onLoad(options) {
+			//console.log(options)
+			let _this = this
+			const data = JSON.parse(options.params)
+			_this.data = data
+			uni.getStorage({
+				key: 'openid',
+				success: function (res) {
+					_this.appData.openid = _this.data.openid
+					if(data.scene){
+						if(data.scene == "3"){
+							//console.log("app进入 -->支付页")
+							_this.data={
+								money:Number(data.money).toFixed(2),
+								channelId:data.channelId,
+								userId:data.userId,
+								scene:data.scene,
+								openid:res.data,
+								app:false,
+							}
+						}
+					}else{
+						//console.log("微信小程序历史记录进入 -->支付页")
+						_this.data={
+							money:data.money,
+							scene:'2',
+							channelId:'',
+							userId:null,
+							openid:data.openid,
+							app:false,
+						}
+					}
+					_this.loading = true
+					_this.data.app = false
+					_this.pay()
+					
+				},
+				fail: function (res) {
+					_this.loading = true
+				},
+			});
+			
+		},
+		methods: {
+			// 关闭小程序
+			closeXCX(){
+				wx.exitMiniProgram({success: (res) => {}})
+			},
+			pay(){
+				let _this = this
+				if(_this.data.openid && _this.data.openid != 'null'  ){
+					if(_this.data.userId){//app用户充值
+						//console.log("app用户充值")
+						requestGet("dxtop/staff/one",
+							{
+								"id":_this.data.userId,
+							},
+						).then(res =>{
+							if(res[1].data.data){
+								requestPost("dxtop/order/callUnifiedPay",
+									{
+										"money": Number(_this.data.money).toFixed(2), 
+										"topPayType": "W06", 
+										"payType": "2", 
+										"channelId":_this.data.channelId,
+										"userId":res[1].data.data.sid,
+										"scene":_this.data.scene,
+										"openId":_this.data.openid,
+									}
+								).then(res2 => {
+									if(res2[1].data?.status == "ERROR"){
+										if(res2[1].data?.code == 500){
+											if(res2[1].data.msg == "acct参数错误"){
+												Toast("华为、Android10系统,需要开启微信的“浮窗”和“允许在其他上层应用上打开”这两个权限")
+											}else{
+												Toast(res2[1].data.msg)
+											}
+										}else{
+											Toast(res2[1].data.msg)
+										}
+										
+									}else{
+										if(res2[1].data){
+											let data = JSON.parse(res2[1].data.data)
+											uni.requestPayment({
+												timeStamp: data.timeStamp,
+												nonceStr: data.nonceStr,
+												package: data.package,
+												signType: data.signType,
+												paySign: data.paySign,
+												success: function (res3) {
+													//console.log('success:' + JSON.stringify(res));
+													uni.redirectTo({
+														url: `../over/index`
+													});
+												},
+												fail: function (err) {
+													//console.log('fail:' + JSON.stringify(err));
+													
+												}
+											});
+										}
+									}
+									
+								}).catch(err =>{
+								})
+							}else{
+								Toast("该用户未暂未录入充值系统...")
+							}
+						})
+					}else{
+						Toast("请使用'中国东信'APP途径进行充值")
+						
+					}
+					
+				}else{
+					//console.log("去授权页",JSON.stringify(_this.data))
+					uni.redirectTo({
+					    url: `../login/index?params=${JSON.stringify(this.data)}`
+					});
+				}
+				
+			}
+			
+		},
+		onShow(options){
+		}
+	}
+</script>
+<style lang="scss" scoped>
+.mianBox{
+    height: 100%;
+    width: 100%;
+    color: #000;
+    box-sizing: border-box;
+	background-color: #F2F6FC;
+	position: fixed;
+    .contentBox{
+		width: 100%;
+		height: auto;
+		padding: 15px 20px;
+		box-sizing: border-box;
+		overflow: hidden;
+		.logo{
+			/deep/ .van-image{
+				margin:0 auto;
+				display: block;
+			}
+		}
+		.introduce{
+			text-align: center;
+			color: #000;
+			display: block;
+			/deep/ .van-col{
+				font-size: 20;
+				margin-top:20px;
+				letter-spacing: 2px;
+			}
+		}
+		.money{
+			text-align: center;
+			color: #000;
+			/deep/ .van-col{
+				font-size: 30px;
+				margin-top: 10px;
+				font-weight: 700;
+			}
+		}
+		.order_money{
+			text-align: center;
+			color: #ccc;
+			display: block;
+			/deep/ .van-col{
+				font-size: 20;
+				margin-top:10px;
+				letter-spacing: 2px;
+			}
+		}
+		/deep/ .van-button{
+			border-radius: 6px;
+			width: 100% !important;
+			margin-top:25px;
+			letter-spacing: 2px;
+			font-size: 18px;
+			height: 50px;
+		}
+		.order_wrap{
+			width:95%;
+			padding:10px 20px 20px 20px;
+			box-sizing: border-box;
+			width:95%;
+			margin:20px 2.5%;
+			background-color: #fff;
+			border-radius: 6px;
+			box-shadow: 0 2px 12px 0 #ccc;
+			display: block;
+			/deep/ .van-col{
+				font-size: 16px;
+				color:#ccc;
+				margin-top:10px;
+				display: block;
+			}
+			/deep/ .left{
+				text-align: left;
+			}
+			/deep/ .right{
+				text-align: right;
+			}
+		}
+		.pay_wrap{
+			width:95%;
+			margin:70px 2.5% 0;
+			.pay{
+				height: 50px;
+				font-size: 18px;
+				border-radius: 10px;
+				margin-top:40px;
+			}
+		}
+		
+    }
+}
+.pay{
+	background:#F22E3C;
+	color:#fff;
+}
+</style>
+
+

+ 271 - 0
.history/pages/order/index_20220607144135.vue

@@ -0,0 +1,271 @@
+<template>
+  <div class="mianBox">
+    <van-row class="contentBox" v-if="loading">
+		<van-row>
+			<van-col span="24" class="logo"><van-image width="75" height="75" :src="require('../img/logo.png')" /></van-col>
+			<van-col span="24" class="introduce">中国东信智慧园区平台</van-col>
+			<van-col span="24" class="money">{{data.money}}</van-col>
+			<van-col span="24" class="order_money">订单金额(元)</van-col>
+		</van-row>
+		<div class="pay_wrap">
+			<van-button class="pay"  color="#F22E3C" @tap="pay">支付</van-button>
+			<button class="pay" open-type="launchApp" app-parameter="appData"  @error="launchAppError" @click="closeXCX" v-if="data.userId">返回APP</button>
+			<!-- <button class="pay" open-type="launchApp" app-parameter="appData"  @error="launchAppError" >返回APP<navigator open-type="exit" target="miniProgram" style="margin:30px 0;display: block;">退出程序</navigator></button> -->
+		</div>
+		<van-toast id="van-toast" />
+		<!-- <van-overlay :show="show" @click="show = false" /> -->
+	</van-row>
+  </div>
+</template>
+<script>
+	import Toast from '../../wxcomponents/vant/weapp/dist/toast/toast';
+	import { requestPost, requestGet } from '@/utils/user.js';
+	export default {
+		data() {
+			return {
+				loading:false,
+				data:{
+					money:undefined,
+					openid:null,
+					app:false,
+				},
+				appData:{
+					errCOde:0,
+					errStr:null,
+					extMsg:"未支付",
+					extraData:"未支付",
+					openid:null,
+					transaction:null,
+					type:"WXLaunchMiniProgramReq.Resp"
+				}
+			}
+		},
+		onLoad(options) {
+			//console.log(options)
+			let _this = this
+			const data = JSON.parse(options.params)
+			_this.data = data
+			uni.getStorage({
+				key: 'openid',
+				success: function (res) {
+					_this.appData.openid = _this.data.openid
+					if(data.scene){
+						if(data.scene == "3"){
+							//console.log("app进入 -->支付页")
+							_this.data={
+								money:Number(data.money).toFixed(2),
+								channelId:data.channelId,
+								userId:data.userId,
+								scene:data.scene,
+								openid:res.data,
+								app:false,
+							}
+						}
+					}else{
+						//console.log("微信小程序历史记录进入 -->支付页")
+						_this.data={
+							money:data.money,
+							scene:'2',
+							channelId:'',
+							userId:null,
+							openid:data.openid,
+							app:false,
+						}
+					}
+					_this.loading = true
+					_this.data.app = false
+					// _this.pay()
+					
+				},
+				fail: function (res) {
+					_this.loading = true
+				},
+			});
+			
+		},
+		methods: {
+			// 关闭小程序
+			closeXCX(){
+				wx.exitMiniProgram({success: (res) => {}})
+			},
+			pay(){
+				let _this = this
+				if(_this.data.openid && _this.data.openid != 'null'  ){
+					if(_this.data.userId){//app用户充值
+						//console.log("app用户充值")
+						requestGet("dxtop/staff/one",
+							{
+								"id":_this.data.userId,
+							},
+						).then(res =>{
+							if(res[1].data.data){
+								requestPost("dxtop/order/callUnifiedPay",
+									{
+										"money": Number(_this.data.money).toFixed(2), 
+										"topPayType": "W06", 
+										"payType": "2", 
+										"channelId":_this.data.channelId,
+										"userId":res[1].data.data.sid,
+										"scene":_this.data.scene,
+										"openId":_this.data.openid,
+									}
+								).then(res2 => {
+									if(res2[1].data?.status == "ERROR"){
+										if(res2[1].data?.code == 500){
+											if(res2[1].data.msg == "acct参数错误"){
+												Toast("华为、Android10系统,需要开启微信的“浮窗”和“允许在其他上层应用上打开”这两个权限")
+											}else{
+												Toast(res2[1].data.msg)
+											}
+										}else{
+											Toast(res2[1].data.msg)
+										}
+										
+									}else{
+										if(res2[1].data){
+											let data = JSON.parse(res2[1].data.data)
+											uni.requestPayment({
+												timeStamp: data.timeStamp,
+												nonceStr: data.nonceStr,
+												package: data.package,
+												signType: data.signType,
+												paySign: data.paySign,
+												success: function (res3) {
+													//console.log('success:' + JSON.stringify(res));
+													uni.redirectTo({
+														url: `../over/index`
+													});
+												},
+												fail: function (err) {
+													//console.log('fail:' + JSON.stringify(err));
+													
+												}
+											});
+										}
+									}
+									
+								}).catch(err =>{
+								})
+							}else{
+								Toast("该用户未暂未录入充值系统...")
+							}
+						})
+					}else{
+						Toast("请使用'中国东信'APP途径进行充值")
+						
+					}
+					
+				}else{
+					//console.log("去授权页",JSON.stringify(_this.data))
+					uni.redirectTo({
+					    url: `../login/index?params=${JSON.stringify(this.data)}`
+					});
+				}
+				
+			}
+			
+		},
+		onShow(options){
+		}
+	}
+</script>
+<style lang="scss" scoped>
+.mianBox{
+    height: 100%;
+    width: 100%;
+    color: #000;
+    box-sizing: border-box;
+	background-color: #F2F6FC;
+	position: fixed;
+    .contentBox{
+		width: 100%;
+		height: auto;
+		padding: 15px 20px;
+		box-sizing: border-box;
+		overflow: hidden;
+		.logo{
+			/deep/ .van-image{
+				margin:0 auto;
+				display: block;
+			}
+		}
+		.introduce{
+			text-align: center;
+			color: #000;
+			display: block;
+			/deep/ .van-col{
+				font-size: 20;
+				margin-top:20px;
+				letter-spacing: 2px;
+			}
+		}
+		.money{
+			text-align: center;
+			color: #000;
+			/deep/ .van-col{
+				font-size: 30px;
+				margin-top: 10px;
+				font-weight: 700;
+			}
+		}
+		.order_money{
+			text-align: center;
+			color: #ccc;
+			display: block;
+			/deep/ .van-col{
+				font-size: 20;
+				margin-top:10px;
+				letter-spacing: 2px;
+			}
+		}
+		/deep/ .van-button{
+			border-radius: 6px;
+			width: 100% !important;
+			margin-top:25px;
+			letter-spacing: 2px;
+			font-size: 18px;
+			height: 50px;
+		}
+		.order_wrap{
+			width:95%;
+			padding:10px 20px 20px 20px;
+			box-sizing: border-box;
+			width:95%;
+			margin:20px 2.5%;
+			background-color: #fff;
+			border-radius: 6px;
+			box-shadow: 0 2px 12px 0 #ccc;
+			display: block;
+			/deep/ .van-col{
+				font-size: 16px;
+				color:#ccc;
+				margin-top:10px;
+				display: block;
+			}
+			/deep/ .left{
+				text-align: left;
+			}
+			/deep/ .right{
+				text-align: right;
+			}
+		}
+		.pay_wrap{
+			width:95%;
+			margin:70px 2.5% 0;
+			.pay{
+				height: 50px;
+				font-size: 18px;
+				border-radius: 10px;
+				margin-top:40px;
+			}
+		}
+		
+    }
+}
+.pay{
+	background:#F22E3C;
+	color:#fff;
+}
+</style>
+
+

+ 271 - 0
.history/pages/order/index_20220607144136.vue

@@ -0,0 +1,271 @@
+<template>
+  <div class="mianBox">
+    <van-row class="contentBox" v-if="loading">
+		<van-row>
+			<van-col span="24" class="logo"><van-image width="75" height="75" :src="require('../img/logo.png')" /></van-col>
+			<van-col span="24" class="introduce">中国东信智慧园区平台</van-col>
+			<van-col span="24" class="money">{{data.money}}</van-col>
+			<van-col span="24" class="order_money">订单金额(元)</van-col>
+		</van-row>
+		<div class="pay_wrap">
+			<van-button class="pay"  color="#F22E3C" @tap="pay">支付</van-button>
+			<button class="pay" open-type="launchApp" app-parameter="appData"  @error="launchAppError" @click="closeXCX" v-if="data.userId">返回APP</button>
+			<!-- <button class="pay" open-type="launchApp" app-parameter="appData"  @error="launchAppError" >返回APP<navigator open-type="exit" target="miniProgram" style="margin:30px 0;display: block;">退出程序</navigator></button> -->
+		</div>
+		<van-toast id="van-toast" />
+		<!-- <van-overlay :show="show" @click="show = false" /> -->
+	</van-row>
+  </div>
+</template>
+<script>
+	import Toast from '../../wxcomponents/vant/weapp/dist/toast/toast';
+	import { requestPost, requestGet } from '@/utils/user.js';
+	export default {
+		data() {
+			return {
+				loading:false,
+				data:{
+					money:undefined,
+					openid:null,
+					app:false,
+				},
+				appData:{
+					errCOde:0,
+					errStr:null,
+					extMsg:"未支付",
+					extraData:"未支付",
+					openid:null,
+					transaction:null,
+					type:"WXLaunchMiniProgramReq.Resp"
+				}
+			}
+		},
+		onLoad(options) {
+			//console.log(options)
+			let _this = this
+			const data = JSON.parse(options.params)
+			_this.data = data
+			uni.getStorage({
+				key: 'openid',
+				success: function (res) {
+					_this.appData.openid = _this.data.openid
+					if(data.scene){
+						if(data.scene == "3"){
+							//console.log("app进入 -->支付页")
+							_this.data={
+								money:Number(data.money).toFixed(2),
+								channelId:data.channelId,
+								userId:data.userId,
+								scene:data.scene,
+								openid:res.data,
+								app:false,
+							}
+						}
+					}else{
+						//console.log("微信小程序历史记录进入 -->支付页")
+						_this.data={
+							money:data.money,
+							scene:'2',
+							channelId:'',
+							userId:null,
+							openid:data.openid,
+							app:false,
+						}
+					}
+					_this.loading = true
+					_this.data.app = false
+					// _this.pay()
+					
+				},
+				fail: function (res) {
+					_this.loading = true
+				},
+			});
+			
+		},
+		methods: {
+			// 关闭小程序
+			closeXCX(){
+				wx.exitMiniProgram({success: (res) => {}})
+			},
+			pay(){
+				let _this = this
+				if(_this.data.openid && _this.data.openid != 'null'  ){
+					if(_this.data.userId){//app用户充值
+						//console.log("app用户充值")
+						requestGet("dxtop/staff/one",
+							{
+								"id":_this.data.userId,
+							},
+						).then(res =>{
+							if(res[1].data.data){
+								requestPost("dxtop/order/callUnifiedPay",
+									{
+										"money": Number(_this.data.money).toFixed(2), 
+										"topPayType": "W06", 
+										"payType": "2", 
+										"channelId":_this.data.channelId,
+										"userId":res[1].data.data.sid,
+										"scene":_this.data.scene,
+										"openId":_this.data.openid,
+									}
+								).then(res2 => {
+									if(res2[1].data?.status == "ERROR"){
+										if(res2[1].data?.code == 500){
+											if(res2[1].data.msg == "acct参数错误"){
+												Toast("华为、Android10系统,需要开启微信的“浮窗”和“允许在其他上层应用上打开”这两个权限")
+											}else{
+												Toast(res2[1].data.msg)
+											}
+										}else{
+											Toast(res2[1].data.msg)
+										}
+										
+									}else{
+										if(res2[1].data){
+											let data = JSON.parse(res2[1].data.data)
+											uni.requestPayment({
+												timeStamp: data.timeStamp,
+												nonceStr: data.nonceStr,
+												package: data.package,
+												signType: data.signType,
+												paySign: data.paySign,
+												success: function (res3) {
+													//console.log('success:' + JSON.stringify(res));
+													uni.redirectTo({
+														url: `../over/index`
+													});
+												},
+												fail: function (err) {
+													//console.log('fail:' + JSON.stringify(err));
+													
+												}
+											});
+										}
+									}
+									
+								}).catch(err =>{
+								})
+							}else{
+								Toast("该用户未暂未录入充值系统...")
+							}
+						})
+					}else{
+						Toast("请使用'中国东信'APP途径进行充值")
+						
+					}
+					
+				}else{
+					//console.log("去授权页",JSON.stringify(_this.data))
+					uni.redirectTo({
+					    url: `../login/index?params=${JSON.stringify(this.data)}`
+					});
+				}
+				
+			}
+			
+		},
+		onShow(options){
+		}
+	}
+</script>
+<style lang="scss" scoped>
+.mianBox{
+    height: 100%;
+    width: 100%;
+    color: #000;
+    box-sizing: border-box;
+	background-color: #F2F6FC;
+	position: fixed;
+    .contentBox{
+		width: 100%;
+		height: auto;
+		padding: 15px 20px;
+		box-sizing: border-box;
+		overflow: hidden;
+		.logo{
+			/deep/ .van-image{
+				margin:0 auto;
+				display: block;
+			}
+		}
+		.introduce{
+			text-align: center;
+			color: #000;
+			display: block;
+			/deep/ .van-col{
+				font-size: 20;
+				margin-top:20px;
+				letter-spacing: 2px;
+			}
+		}
+		.money{
+			text-align: center;
+			color: #000;
+			/deep/ .van-col{
+				font-size: 30px;
+				margin-top: 10px;
+				font-weight: 700;
+			}
+		}
+		.order_money{
+			text-align: center;
+			color: #ccc;
+			display: block;
+			/deep/ .van-col{
+				font-size: 20;
+				margin-top:10px;
+				letter-spacing: 2px;
+			}
+		}
+		/deep/ .van-button{
+			border-radius: 6px;
+			width: 100% !important;
+			margin-top:25px;
+			letter-spacing: 2px;
+			font-size: 18px;
+			height: 50px;
+		}
+		.order_wrap{
+			width:95%;
+			padding:10px 20px 20px 20px;
+			box-sizing: border-box;
+			width:95%;
+			margin:20px 2.5%;
+			background-color: #fff;
+			border-radius: 6px;
+			box-shadow: 0 2px 12px 0 #ccc;
+			display: block;
+			/deep/ .van-col{
+				font-size: 16px;
+				color:#ccc;
+				margin-top:10px;
+				display: block;
+			}
+			/deep/ .left{
+				text-align: left;
+			}
+			/deep/ .right{
+				text-align: right;
+			}
+		}
+		.pay_wrap{
+			width:95%;
+			margin:70px 2.5% 0;
+			.pay{
+				height: 50px;
+				font-size: 18px;
+				border-radius: 10px;
+				margin-top:40px;
+			}
+		}
+		
+    }
+}
+.pay{
+	background:#F22E3C;
+	color:#fff;
+}
+</style>
+
+

+ 166 - 0
.history/pages/over/index_20220607143625.vue

@@ -0,0 +1,166 @@
+<template>
+  <div class="mianBox">
+    <van-row class="contentBox">
+		<van-row>
+			<van-col span="24" class="logo"><van-image width="75" height="75" :src="require('../img/success.png')" /></van-col>
+			<van-col span="24" class="introduce">支付完成</van-col>
+		</van-row>
+		<div class="pay_wrap">
+			<!-- <button class="pay" open-type="launchApp" app-parameter="wechat"  binderror="launchAppError">返回APP</button> -->
+			<button class="pay" open-type="launchApp" app-parameter="appData"  @error="launchAppError" v-if="state">返回APP</button>
+			<button class="pay"  v-if="!state" @tap ="home">返回首页</button>
+		</div>
+		<van-toast id="van-toast" />
+	</van-row>
+  </div>
+</template>
+<script>
+	import Toast from '../../wxcomponents/vant/weapp/dist/toast/toast';
+	export default {
+		data() {
+			return {
+				param:undefined,
+				state:false,
+				appData:{
+					errCOde:0,
+					errStr:null,
+					extMsg:"已支付",
+					extraData:"已支付",
+					openId:undefined,
+					transaction:null,
+					type:"WXLaunchMiniProgramReq.Resp"
+				}
+			}
+		},
+		onLoad(options) {
+			let _this = this
+			uni.getStorage({
+				key:"openid",
+				success(e){
+					if(e.data){
+						_this.appData.openId = e.data
+						_this.appData = JSON.stringify(_this.appData)
+					}
+				}
+			})
+			if(!options.type){
+				this.state = true	
+			}else{
+				this.state = false
+			}
+		},
+		methods: {
+			launchAppError(e) {
+				Toast(e.detail.errMsg)
+			},
+			home(){
+				uni.redirectTo({
+				    url: `../index/index`
+				});
+			}
+			
+		},
+		onShow(options){
+		}
+	}
+</script>
+<style lang="scss" scoped>
+.mianBox{
+    height: 100%;
+    width: 100%;
+    color: #000;
+    box-sizing: border-box;
+	background-color: #F2F6FC;
+	position: fixed;
+    .contentBox{
+		width: 100%;
+		height: auto;
+		padding: 15px 20px;
+		box-sizing: border-box;
+		overflow: hidden;
+		.logo{
+			/deep/ .van-image{
+				margin:40px auto 0;
+				display: block;
+			}
+		}
+		.introduce{
+			text-align: center;
+			color: #000;
+			display: block;
+			/deep/ .van-col{
+				font-size: 20;
+				margin-top:20px;
+				letter-spacing: 2px;
+			}
+		}
+		.money{
+			text-align: center;
+			color: #000;
+			/deep/ .van-col{
+				font-size: 30px;
+				margin-top: 10px;
+				font-weight: 700;
+			}
+		}
+		.order_money{
+			text-align: center;
+			color: #ccc;
+			display: block;
+			/deep/ .van-col{
+				font-size: 20;
+				margin-top:10px;
+				letter-spacing: 2px;
+			}
+		}
+		/deep/ .van-button{
+			border-radius: 6px;
+			width: 100% !important;
+			margin-top:25px;
+			letter-spacing: 2px;
+			font-size: 18px;
+			height: 50px;
+		}
+		.order_wrap{
+			width:95%;
+			padding:10px 20px 20px 20px;
+			box-sizing: border-box;
+			width:95%;
+			margin:20px 2.5%;
+			background-color: #fff;
+			border-radius: 6px;
+			box-shadow: 0 2px 12px 0 #ccc;
+			display: block;
+			/deep/ .van-col{
+				font-size: 16px;
+				color:#ccc;
+				margin-top:10px;
+				display: block;
+			}
+			/deep/ .left{
+				text-align: left;
+			}
+			/deep/ .right{
+				text-align: right;
+			}
+		}
+		.pay_wrap{
+			width:95%;
+			margin:70px 2.5% 0;
+			.pay{
+				height: 50px;
+				font-size: 18px;
+				border-radius: 10px;
+				margin-top:40px;
+			}
+		}
+		
+    }
+}
+.pay{
+	background:#F22E3C;
+	color:#fff;
+}
+</style>
+
+

+ 170 - 0
.history/pages/over/index_20220607143935.vue

@@ -0,0 +1,170 @@
+<template>
+  <div class="mianBox">
+    <van-row class="contentBox">
+		<van-row>
+			<van-col span="24" class="logo"><van-image width="75" height="75" :src="require('../img/success.png')" /></van-col>
+			<van-col span="24" class="introduce">支付完成</van-col>
+		</van-row>
+		<div class="pay_wrap">
+			<!-- <button class="pay" open-type="launchApp" app-parameter="wechat"  binderror="launchAppError">返回APP</button> -->
+			<button class="pay" open-type="launchApp" app-parameter="appData"  @error="launchAppError" v-if="state">返回APP</button>
+			<button class="pay"  v-if="!state" @tap ="home">返回首页</button>
+		</div>
+		<van-toast id="van-toast" />
+	</van-row>
+  </div>
+</template>
+<script>
+	import Toast from '../../wxcomponents/vant/weapp/dist/toast/toast';
+	export default {
+		data() {
+			return {
+				param:undefined,
+				state:false,
+				appData:{
+					errCOde:0,
+					errStr:null,
+					extMsg:"已支付",
+					extraData:"已支付",
+					openId:undefined,
+					transaction:null,
+					type:"WXLaunchMiniProgramReq.Resp"
+				}
+			}
+		},
+		onLoad(options) {
+			let _this = this
+			uni.getStorage({
+				key:"openid",
+				success(e){
+					if(e.data){
+						_this.appData.openId = e.data
+						_this.appData = JSON.stringify(_this.appData)
+					}
+				}
+			})
+			if(!options.type){
+				this.state = true	
+			}else{
+				this.state = false
+			}
+		},
+		methods: {
+			// 关闭小程序
+			closeXCX(){
+				wx.exitMiniProgram({success: (res) => {}})
+			},
+			launchAppError(e) {
+				Toast(e.detail.errMsg)
+			},
+			home(){
+				uni.redirectTo({
+				    url: `../index/index`
+				});
+			}
+			
+		},
+		onShow(options){
+		}
+	}
+</script>
+<style lang="scss" scoped>
+.mianBox{
+    height: 100%;
+    width: 100%;
+    color: #000;
+    box-sizing: border-box;
+	background-color: #F2F6FC;
+	position: fixed;
+    .contentBox{
+		width: 100%;
+		height: auto;
+		padding: 15px 20px;
+		box-sizing: border-box;
+		overflow: hidden;
+		.logo{
+			/deep/ .van-image{
+				margin:40px auto 0;
+				display: block;
+			}
+		}
+		.introduce{
+			text-align: center;
+			color: #000;
+			display: block;
+			/deep/ .van-col{
+				font-size: 20;
+				margin-top:20px;
+				letter-spacing: 2px;
+			}
+		}
+		.money{
+			text-align: center;
+			color: #000;
+			/deep/ .van-col{
+				font-size: 30px;
+				margin-top: 10px;
+				font-weight: 700;
+			}
+		}
+		.order_money{
+			text-align: center;
+			color: #ccc;
+			display: block;
+			/deep/ .van-col{
+				font-size: 20;
+				margin-top:10px;
+				letter-spacing: 2px;
+			}
+		}
+		/deep/ .van-button{
+			border-radius: 6px;
+			width: 100% !important;
+			margin-top:25px;
+			letter-spacing: 2px;
+			font-size: 18px;
+			height: 50px;
+		}
+		.order_wrap{
+			width:95%;
+			padding:10px 20px 20px 20px;
+			box-sizing: border-box;
+			width:95%;
+			margin:20px 2.5%;
+			background-color: #fff;
+			border-radius: 6px;
+			box-shadow: 0 2px 12px 0 #ccc;
+			display: block;
+			/deep/ .van-col{
+				font-size: 16px;
+				color:#ccc;
+				margin-top:10px;
+				display: block;
+			}
+			/deep/ .left{
+				text-align: left;
+			}
+			/deep/ .right{
+				text-align: right;
+			}
+		}
+		.pay_wrap{
+			width:95%;
+			margin:70px 2.5% 0;
+			.pay{
+				height: 50px;
+				font-size: 18px;
+				border-radius: 10px;
+				margin-top:40px;
+			}
+		}
+		
+    }
+}
+.pay{
+	background:#F22E3C;
+	color:#fff;
+}
+</style>
+
+

+ 170 - 0
.history/pages/over/index_20220607143950.vue

@@ -0,0 +1,170 @@
+<template>
+  <div class="mianBox">
+    <van-row class="contentBox">
+		<van-row>
+			<van-col span="24" class="logo"><van-image width="75" height="75" :src="require('../img/success.png')" /></van-col>
+			<van-col span="24" class="introduce">支付完成</van-col>
+		</van-row>
+		<div class="pay_wrap">
+			<!-- <button class="pay" open-type="launchApp" app-parameter="wechat"  binderror="launchAppError">返回APP</button> -->
+			<button class="pay" open-type="launchApp" app-parameter="appData"  @error="launchAppError" @click="closeXCX" v-if="state">返回APP</button>
+			<button class="pay"  v-if="!state" @tap ="home">返回首页</button>
+		</div>
+		<van-toast id="van-toast" />
+	</van-row>
+  </div>
+</template>
+<script>
+	import Toast from '../../wxcomponents/vant/weapp/dist/toast/toast';
+	export default {
+		data() {
+			return {
+				param:undefined,
+				state:false,
+				appData:{
+					errCOde:0,
+					errStr:null,
+					extMsg:"已支付",
+					extraData:"已支付",
+					openId:undefined,
+					transaction:null,
+					type:"WXLaunchMiniProgramReq.Resp"
+				}
+			}
+		},
+		onLoad(options) {
+			let _this = this
+			uni.getStorage({
+				key:"openid",
+				success(e){
+					if(e.data){
+						_this.appData.openId = e.data
+						_this.appData = JSON.stringify(_this.appData)
+					}
+				}
+			})
+			if(!options.type){
+				this.state = true	
+			}else{
+				this.state = false
+			}
+		},
+		methods: {
+			// 关闭小程序
+			closeXCX(){
+				wx.exitMiniProgram({success: (res) => {}})
+			},
+			launchAppError(e) {
+				Toast(e.detail.errMsg)
+			},
+			home(){
+				uni.redirectTo({
+				    url: `../index/index`
+				});
+			}
+			
+		},
+		onShow(options){
+		}
+	}
+</script>
+<style lang="scss" scoped>
+.mianBox{
+    height: 100%;
+    width: 100%;
+    color: #000;
+    box-sizing: border-box;
+	background-color: #F2F6FC;
+	position: fixed;
+    .contentBox{
+		width: 100%;
+		height: auto;
+		padding: 15px 20px;
+		box-sizing: border-box;
+		overflow: hidden;
+		.logo{
+			/deep/ .van-image{
+				margin:40px auto 0;
+				display: block;
+			}
+		}
+		.introduce{
+			text-align: center;
+			color: #000;
+			display: block;
+			/deep/ .van-col{
+				font-size: 20;
+				margin-top:20px;
+				letter-spacing: 2px;
+			}
+		}
+		.money{
+			text-align: center;
+			color: #000;
+			/deep/ .van-col{
+				font-size: 30px;
+				margin-top: 10px;
+				font-weight: 700;
+			}
+		}
+		.order_money{
+			text-align: center;
+			color: #ccc;
+			display: block;
+			/deep/ .van-col{
+				font-size: 20;
+				margin-top:10px;
+				letter-spacing: 2px;
+			}
+		}
+		/deep/ .van-button{
+			border-radius: 6px;
+			width: 100% !important;
+			margin-top:25px;
+			letter-spacing: 2px;
+			font-size: 18px;
+			height: 50px;
+		}
+		.order_wrap{
+			width:95%;
+			padding:10px 20px 20px 20px;
+			box-sizing: border-box;
+			width:95%;
+			margin:20px 2.5%;
+			background-color: #fff;
+			border-radius: 6px;
+			box-shadow: 0 2px 12px 0 #ccc;
+			display: block;
+			/deep/ .van-col{
+				font-size: 16px;
+				color:#ccc;
+				margin-top:10px;
+				display: block;
+			}
+			/deep/ .left{
+				text-align: left;
+			}
+			/deep/ .right{
+				text-align: right;
+			}
+		}
+		.pay_wrap{
+			width:95%;
+			margin:70px 2.5% 0;
+			.pay{
+				height: 50px;
+				font-size: 18px;
+				border-radius: 10px;
+				margin-top:40px;
+			}
+		}
+		
+    }
+}
+.pay{
+	background:#F22E3C;
+	color:#fff;
+}
+</style>
+
+

+ 170 - 0
.history/pages/over/index_20220607143951.vue

@@ -0,0 +1,170 @@
+<template>
+  <div class="mianBox">
+    <van-row class="contentBox">
+		<van-row>
+			<van-col span="24" class="logo"><van-image width="75" height="75" :src="require('../img/success.png')" /></van-col>
+			<van-col span="24" class="introduce">支付完成</van-col>
+		</van-row>
+		<div class="pay_wrap">
+			<!-- <button class="pay" open-type="launchApp" app-parameter="wechat"  binderror="launchAppError">返回APP</button> -->
+			<button class="pay" open-type="launchApp" app-parameter="appData"  @error="launchAppError" @click="closeXCX" v-if="state">返回APP</button>
+			<button class="pay"  v-if="!state" @tap ="home">返回首页</button>
+		</div>
+		<van-toast id="van-toast" />
+	</van-row>
+  </div>
+</template>
+<script>
+	import Toast from '../../wxcomponents/vant/weapp/dist/toast/toast';
+	export default {
+		data() {
+			return {
+				param:undefined,
+				state:false,
+				appData:{
+					errCOde:0,
+					errStr:null,
+					extMsg:"已支付",
+					extraData:"已支付",
+					openId:undefined,
+					transaction:null,
+					type:"WXLaunchMiniProgramReq.Resp"
+				}
+			}
+		},
+		onLoad(options) {
+			let _this = this
+			uni.getStorage({
+				key:"openid",
+				success(e){
+					if(e.data){
+						_this.appData.openId = e.data
+						_this.appData = JSON.stringify(_this.appData)
+					}
+				}
+			})
+			if(!options.type){
+				this.state = true	
+			}else{
+				this.state = false
+			}
+		},
+		methods: {
+			// 关闭小程序
+			closeXCX(){
+				wx.exitMiniProgram({success: (res) => {}})
+			},
+			launchAppError(e) {
+				Toast(e.detail.errMsg)
+			},
+			home(){
+				uni.redirectTo({
+				    url: `../index/index`
+				});
+			}
+			
+		},
+		onShow(options){
+		}
+	}
+</script>
+<style lang="scss" scoped>
+.mianBox{
+    height: 100%;
+    width: 100%;
+    color: #000;
+    box-sizing: border-box;
+	background-color: #F2F6FC;
+	position: fixed;
+    .contentBox{
+		width: 100%;
+		height: auto;
+		padding: 15px 20px;
+		box-sizing: border-box;
+		overflow: hidden;
+		.logo{
+			/deep/ .van-image{
+				margin:40px auto 0;
+				display: block;
+			}
+		}
+		.introduce{
+			text-align: center;
+			color: #000;
+			display: block;
+			/deep/ .van-col{
+				font-size: 20;
+				margin-top:20px;
+				letter-spacing: 2px;
+			}
+		}
+		.money{
+			text-align: center;
+			color: #000;
+			/deep/ .van-col{
+				font-size: 30px;
+				margin-top: 10px;
+				font-weight: 700;
+			}
+		}
+		.order_money{
+			text-align: center;
+			color: #ccc;
+			display: block;
+			/deep/ .van-col{
+				font-size: 20;
+				margin-top:10px;
+				letter-spacing: 2px;
+			}
+		}
+		/deep/ .van-button{
+			border-radius: 6px;
+			width: 100% !important;
+			margin-top:25px;
+			letter-spacing: 2px;
+			font-size: 18px;
+			height: 50px;
+		}
+		.order_wrap{
+			width:95%;
+			padding:10px 20px 20px 20px;
+			box-sizing: border-box;
+			width:95%;
+			margin:20px 2.5%;
+			background-color: #fff;
+			border-radius: 6px;
+			box-shadow: 0 2px 12px 0 #ccc;
+			display: block;
+			/deep/ .van-col{
+				font-size: 16px;
+				color:#ccc;
+				margin-top:10px;
+				display: block;
+			}
+			/deep/ .left{
+				text-align: left;
+			}
+			/deep/ .right{
+				text-align: right;
+			}
+		}
+		.pay_wrap{
+			width:95%;
+			margin:70px 2.5% 0;
+			.pay{
+				height: 50px;
+				font-size: 18px;
+				border-radius: 10px;
+				margin-top:40px;
+			}
+		}
+		
+    }
+}
+.pay{
+	background:#F22E3C;
+	color:#fff;
+}
+</style>
+
+

+ 170 - 0
.history/pages/over/index_20220607143955.vue

@@ -0,0 +1,170 @@
+<template>
+  <div class="mianBox">
+    <van-row class="contentBox">
+		<van-row>
+			<van-col span="24" class="logo"><van-image width="75" height="75" :src="require('../img/success.png')" /></van-col>
+			<van-col span="24" class="introduce">支付完成</van-col>
+		</van-row>
+		<div class="pay_wrap">
+			<!-- <button class="pay" open-type="launchApp" app-parameter="wechat"  binderror="launchAppError">返回APP</button> -->
+			<button class="pay" open-type="launchApp" app-parameter="appData"  @error="launchAppError" @click="closeXCX" v-if="state">返回APP</button>
+			<button class="pay"  v-if="!state" @tap ="home">返回首页</button>
+		</div>
+		<van-toast id="van-toast" />
+	</van-row>
+  </div>
+</template>
+<script>
+	import Toast from '../../wxcomponents/vant/weapp/dist/toast/toast';
+	export default {
+		data() {
+			return {
+				param:undefined,
+				state:false,
+				appData:{
+					errCOde:0,
+					errStr:null,
+					extMsg:"已支付",
+					extraData:"已支付",
+					openId:undefined,
+					transaction:null,
+					type:"WXLaunchMiniProgramReq.Resp"
+				}
+			}
+		},
+		onLoad(options) {
+			let _this = this
+			uni.getStorage({
+				key:"openid",
+				success(e){
+					if(e.data){
+						_this.appData.openId = e.data
+						_this.appData = JSON.stringify(_this.appData)
+					}
+				}
+			})
+			if(!options.type){
+				this.state = true	
+			}else{
+				this.state = false
+			}
+		},
+		methods: {
+			// 关闭小程序
+			closeXCX(){
+				wx.exitMiniProgram({success: (res) => {}})
+			},
+			launchAppError(e) {
+				Toast(e.detail.errMsg)
+			},
+			home(){
+				uni.redirectTo({
+				    url: `../index/index`
+				});
+			}
+			
+		},
+		onShow(options){
+		}
+	}
+</script>
+<style lang="scss" scoped>
+.mianBox{
+    height: 100%;
+    width: 100%;
+    color: #000;
+    box-sizing: border-box;
+	background-color: #F2F6FC;
+	position: fixed;
+    .contentBox{
+		width: 100%;
+		height: auto;
+		padding: 15px 20px;
+		box-sizing: border-box;
+		overflow: hidden;
+		.logo{
+			/deep/ .van-image{
+				margin:40px auto 0;
+				display: block;
+			}
+		}
+		.introduce{
+			text-align: center;
+			color: #000;
+			display: block;
+			/deep/ .van-col{
+				font-size: 20;
+				margin-top:20px;
+				letter-spacing: 2px;
+			}
+		}
+		.money{
+			text-align: center;
+			color: #000;
+			/deep/ .van-col{
+				font-size: 30px;
+				margin-top: 10px;
+				font-weight: 700;
+			}
+		}
+		.order_money{
+			text-align: center;
+			color: #ccc;
+			display: block;
+			/deep/ .van-col{
+				font-size: 20;
+				margin-top:10px;
+				letter-spacing: 2px;
+			}
+		}
+		/deep/ .van-button{
+			border-radius: 6px;
+			width: 100% !important;
+			margin-top:25px;
+			letter-spacing: 2px;
+			font-size: 18px;
+			height: 50px;
+		}
+		.order_wrap{
+			width:95%;
+			padding:10px 20px 20px 20px;
+			box-sizing: border-box;
+			width:95%;
+			margin:20px 2.5%;
+			background-color: #fff;
+			border-radius: 6px;
+			box-shadow: 0 2px 12px 0 #ccc;
+			display: block;
+			/deep/ .van-col{
+				font-size: 16px;
+				color:#ccc;
+				margin-top:10px;
+				display: block;
+			}
+			/deep/ .left{
+				text-align: left;
+			}
+			/deep/ .right{
+				text-align: right;
+			}
+		}
+		.pay_wrap{
+			width:95%;
+			margin:70px 2.5% 0;
+			.pay{
+				height: 50px;
+				font-size: 18px;
+				border-radius: 10px;
+				margin-top:40px;
+			}
+		}
+		
+    }
+}
+.pay{
+	background:#F22E3C;
+	color:#fff;
+}
+</style>
+
+

+ 170 - 0
.history/pages/over/index_20220607144053.vue

@@ -0,0 +1,170 @@
+<template>
+  <div class="mianBox">
+    <van-row class="contentBox">
+		<van-row>
+			<van-col span="24" class="logo"><van-image width="75" height="75" :src="require('../img/success.png')" /></van-col>
+			<van-col span="24" class="introduce">支付完成</van-col>
+		</van-row>
+		<div class="pay_wrap">
+			<!-- <button class="pay" open-type="launchApp" app-parameter="wechat"  binderror="launchAppError">返回APP</button> -->
+			<button class="pay" open-type="launchApp" app-parameter="appData"  @error="launchAppError" @click="closeXCX" v-if="state">返回APP</button>
+			<button class="pay"  v-if="!state" @tap ="home">返回首页</button>
+		</div>
+		<van-toast id="van-toast" />
+	</van-row>
+  </div>
+</template>
+<script>
+	import Toast from '../../wxcomponents/vant/weapp/dist/toast/toast';
+	export default {
+		data() {
+			return {
+				param:undefined,
+				state:false,
+				appData:{
+					errCOde:0,
+					errStr:null,
+					extMsg:"已支付",
+					extraData:"已支付",
+					openId:undefined,
+					transaction:null,
+					type:"WXLaunchMiniProgramReq.Resp"
+				}
+			}
+		},
+		onLoad(options) {
+			let _this = this
+			uni.getStorage({
+				key:"openid",
+				success(e){
+					if(e.data){
+						_this.appData.openId = e.data
+						_this.appData = JSON.stringify(_this.appData)
+					}
+				}
+			})
+			if(!options.type){
+				this.state = true	
+			}else{
+				this.state = false
+			}
+		},
+		methods: {
+			// 关闭小程序
+			closeXCX(){
+				wx.exitMiniProgram({success: (res) => {}})
+			},
+			launchAppError(e) {
+				Toast(e.detail.errMsg)
+			},
+			home(){
+				uni.redirectTo({
+				    url: `../index/index`
+				});
+			}
+			
+		},
+		onShow(options){
+		}
+	}
+</script>
+<style lang="scss" scoped>
+.mianBox{
+    height: 100%;
+    width: 100%;
+    color: #000;
+    box-sizing: border-box;
+	background-color: #F2F6FC;
+	position: fixed;
+    .contentBox{
+		width: 100%;
+		height: auto;
+		padding: 15px 20px;
+		box-sizing: border-box;
+		overflow: hidden;
+		.logo{
+			/deep/ .van-image{
+				margin:40px auto 0;
+				display: block;
+			}
+		}
+		.introduce{
+			text-align: center;
+			color: #000;
+			display: block;
+			/deep/ .van-col{
+				font-size: 20;
+				margin-top:20px;
+				letter-spacing: 2px;
+			}
+		}
+		.money{
+			text-align: center;
+			color: #000;
+			/deep/ .van-col{
+				font-size: 30px;
+				margin-top: 10px;
+				font-weight: 700;
+			}
+		}
+		.order_money{
+			text-align: center;
+			color: #ccc;
+			display: block;
+			/deep/ .van-col{
+				font-size: 20;
+				margin-top:10px;
+				letter-spacing: 2px;
+			}
+		}
+		/deep/ .van-button{
+			border-radius: 6px;
+			width: 100% !important;
+			margin-top:25px;
+			letter-spacing: 2px;
+			font-size: 18px;
+			height: 50px;
+		}
+		.order_wrap{
+			width:95%;
+			padding:10px 20px 20px 20px;
+			box-sizing: border-box;
+			width:95%;
+			margin:20px 2.5%;
+			background-color: #fff;
+			border-radius: 6px;
+			box-shadow: 0 2px 12px 0 #ccc;
+			display: block;
+			/deep/ .van-col{
+				font-size: 16px;
+				color:#ccc;
+				margin-top:10px;
+				display: block;
+			}
+			/deep/ .left{
+				text-align: left;
+			}
+			/deep/ .right{
+				text-align: right;
+			}
+		}
+		.pay_wrap{
+			width:95%;
+			margin:70px 2.5% 0;
+			.pay{
+				height: 50px;
+				font-size: 18px;
+				border-radius: 10px;
+				margin-top:40px;
+			}
+		}
+		
+    }
+}
+.pay{
+	background:#F22E3C;
+	color:#fff;
+}
+</style>
+
+

+ 170 - 0
.history/pages/over/index_20220607144105.vue

@@ -0,0 +1,170 @@
+<template>
+  <div class="mianBox">
+    <van-row class="contentBox">
+		<van-row>
+			<van-col span="24" class="logo"><van-image width="75" height="75" :src="require('../img/success.png')" /></van-col>
+			<van-col span="24" class="introduce">支付完成</van-col>
+		</van-row>
+		<div class="pay_wrap">
+			<!-- <button class="pay" open-type="launchApp" app-parameter="wechat"  binderror="launchAppError">返回APP</button> -->
+			<button class="pay" open-type="launchApp" app-parameter="appData"  @error="launchAppError" @click="closeXCX" v-if="state">返回APP</button>
+			<button class="pay"  v-if="!state" @tap ="home">返回首页</button>
+		</div>
+		<van-toast id="van-toast" />
+	</van-row>
+  </div>
+</template>
+<script>
+	import Toast from '../../wxcomponents/vant/weapp/dist/toast/toast';
+	export default {
+		data() {
+			return {
+				param:undefined,
+				state:false,
+				appData:{
+					errCOde:0,
+					errStr:null,
+					extMsg:"已支付",
+					extraData:"已支付",
+					openId:undefined,
+					transaction:null,
+					type:"WXLaunchMiniProgramReq.Resp"
+				}
+			}
+		},
+		onLoad(options) {
+			let _this = this
+			uni.getStorage({
+				key:"openid",
+				success(e){
+					if(e.data){
+						_this.appData.openId = e.data
+						_this.appData = JSON.stringify(_this.appData)
+					}
+				}
+			})
+			if(!options.type){
+				this.state = true	
+			}else{
+				this.state = false
+			}
+		},
+		methods: {
+			// 关闭小程序
+			closeXCX(){
+				wx.exitMiniProgram({success: (res) => {}})
+			},
+			launchAppError(e) {
+				Toast(e.detail.errMsg)
+			},
+			home(){
+				uni.redirectTo({
+				    url: `../index/index`
+				});
+			}
+			
+		},
+		onShow(options){
+		}
+	}
+</script>
+<style lang="scss" scoped>
+.mianBox{
+    height: 100%;
+    width: 100%;
+    color: #000;
+    box-sizing: border-box;
+	background-color: #F2F6FC;
+	position: fixed;
+    .contentBox{
+		width: 100%;
+		height: auto;
+		padding: 15px 20px;
+		box-sizing: border-box;
+		overflow: hidden;
+		.logo{
+			/deep/ .van-image{
+				margin:40px auto 0;
+				display: block;
+			}
+		}
+		.introduce{
+			text-align: center;
+			color: #000;
+			display: block;
+			/deep/ .van-col{
+				font-size: 20;
+				margin-top:20px;
+				letter-spacing: 2px;
+			}
+		}
+		.money{
+			text-align: center;
+			color: #000;
+			/deep/ .van-col{
+				font-size: 30px;
+				margin-top: 10px;
+				font-weight: 700;
+			}
+		}
+		.order_money{
+			text-align: center;
+			color: #ccc;
+			display: block;
+			/deep/ .van-col{
+				font-size: 20;
+				margin-top:10px;
+				letter-spacing: 2px;
+			}
+		}
+		/deep/ .van-button{
+			border-radius: 6px;
+			width: 100% !important;
+			margin-top:25px;
+			letter-spacing: 2px;
+			font-size: 18px;
+			height: 50px;
+		}
+		.order_wrap{
+			width:95%;
+			padding:10px 20px 20px 20px;
+			box-sizing: border-box;
+			width:95%;
+			margin:20px 2.5%;
+			background-color: #fff;
+			border-radius: 6px;
+			box-shadow: 0 2px 12px 0 #ccc;
+			display: block;
+			/deep/ .van-col{
+				font-size: 16px;
+				color:#ccc;
+				margin-top:10px;
+				display: block;
+			}
+			/deep/ .left{
+				text-align: left;
+			}
+			/deep/ .right{
+				text-align: right;
+			}
+		}
+		.pay_wrap{
+			width:95%;
+			margin:70px 2.5% 0;
+			.pay{
+				height: 50px;
+				font-size: 18px;
+				border-radius: 10px;
+				margin-top:40px;
+			}
+		}
+		
+    }
+}
+.pay{
+	background:#F22E3C;
+	color:#fff;
+}
+</style>
+
+

+ 169 - 0
.history/pages/over/index_20220607144111.vue

@@ -0,0 +1,169 @@
+<template>
+  <div class="mianBox">
+    <van-row class="contentBox">
+		<van-row>
+			<van-col span="24" class="logo"><van-image width="75" height="75" :src="require('../img/success.png')" /></van-col>
+			<van-col span="24" class="introduce">支付完成</van-col>
+		</van-row>
+		<div class="pay_wrap">
+			<button class="pay" open-type="launchApp" app-parameter="appData"  @error="launchAppError" @click="closeXCX" v-if="state">返回APP</button>
+			<button class="pay"  v-if="!state" @tap ="home">返回首页</button>
+		</div>
+		<van-toast id="van-toast" />
+	</van-row>
+  </div>
+</template>
+<script>
+	import Toast from '../../wxcomponents/vant/weapp/dist/toast/toast';
+	export default {
+		data() {
+			return {
+				param:undefined,
+				state:false,
+				appData:{
+					errCOde:0,
+					errStr:null,
+					extMsg:"已支付",
+					extraData:"已支付",
+					openId:undefined,
+					transaction:null,
+					type:"WXLaunchMiniProgramReq.Resp"
+				}
+			}
+		},
+		onLoad(options) {
+			let _this = this
+			uni.getStorage({
+				key:"openid",
+				success(e){
+					if(e.data){
+						_this.appData.openId = e.data
+						_this.appData = JSON.stringify(_this.appData)
+					}
+				}
+			})
+			if(!options.type){
+				this.state = true	
+			}else{
+				this.state = false
+			}
+		},
+		methods: {
+			// 关闭小程序
+			closeXCX(){
+				wx.exitMiniProgram({success: (res) => {}})
+			},
+			launchAppError(e) {
+				Toast(e.detail.errMsg)
+			},
+			home(){
+				uni.redirectTo({
+				    url: `../index/index`
+				});
+			}
+			
+		},
+		onShow(options){
+		}
+	}
+</script>
+<style lang="scss" scoped>
+.mianBox{
+    height: 100%;
+    width: 100%;
+    color: #000;
+    box-sizing: border-box;
+	background-color: #F2F6FC;
+	position: fixed;
+    .contentBox{
+		width: 100%;
+		height: auto;
+		padding: 15px 20px;
+		box-sizing: border-box;
+		overflow: hidden;
+		.logo{
+			/deep/ .van-image{
+				margin:40px auto 0;
+				display: block;
+			}
+		}
+		.introduce{
+			text-align: center;
+			color: #000;
+			display: block;
+			/deep/ .van-col{
+				font-size: 20;
+				margin-top:20px;
+				letter-spacing: 2px;
+			}
+		}
+		.money{
+			text-align: center;
+			color: #000;
+			/deep/ .van-col{
+				font-size: 30px;
+				margin-top: 10px;
+				font-weight: 700;
+			}
+		}
+		.order_money{
+			text-align: center;
+			color: #ccc;
+			display: block;
+			/deep/ .van-col{
+				font-size: 20;
+				margin-top:10px;
+				letter-spacing: 2px;
+			}
+		}
+		/deep/ .van-button{
+			border-radius: 6px;
+			width: 100% !important;
+			margin-top:25px;
+			letter-spacing: 2px;
+			font-size: 18px;
+			height: 50px;
+		}
+		.order_wrap{
+			width:95%;
+			padding:10px 20px 20px 20px;
+			box-sizing: border-box;
+			width:95%;
+			margin:20px 2.5%;
+			background-color: #fff;
+			border-radius: 6px;
+			box-shadow: 0 2px 12px 0 #ccc;
+			display: block;
+			/deep/ .van-col{
+				font-size: 16px;
+				color:#ccc;
+				margin-top:10px;
+				display: block;
+			}
+			/deep/ .left{
+				text-align: left;
+			}
+			/deep/ .right{
+				text-align: right;
+			}
+		}
+		.pay_wrap{
+			width:95%;
+			margin:70px 2.5% 0;
+			.pay{
+				height: 50px;
+				font-size: 18px;
+				border-radius: 10px;
+				margin-top:40px;
+			}
+		}
+		
+    }
+}
+.pay{
+	background:#F22E3C;
+	color:#fff;
+}
+</style>
+
+

+ 169 - 0
.history/pages/over/index_20220607144112.vue

@@ -0,0 +1,169 @@
+<template>
+  <div class="mianBox">
+    <van-row class="contentBox">
+		<van-row>
+			<van-col span="24" class="logo"><van-image width="75" height="75" :src="require('../img/success.png')" /></van-col>
+			<van-col span="24" class="introduce">支付完成</van-col>
+		</van-row>
+		<div class="pay_wrap">
+			<button class="pay" open-type="launchApp" app-parameter="appData"  @error="launchAppError" @click="closeXCX" v-if="state">返回APP</button>
+			<button class="pay"  v-if="!state" @tap ="home">返回首页</button>
+		</div>
+		<van-toast id="van-toast" />
+	</van-row>
+  </div>
+</template>
+<script>
+	import Toast from '../../wxcomponents/vant/weapp/dist/toast/toast';
+	export default {
+		data() {
+			return {
+				param:undefined,
+				state:false,
+				appData:{
+					errCOde:0,
+					errStr:null,
+					extMsg:"已支付",
+					extraData:"已支付",
+					openId:undefined,
+					transaction:null,
+					type:"WXLaunchMiniProgramReq.Resp"
+				}
+			}
+		},
+		onLoad(options) {
+			let _this = this
+			uni.getStorage({
+				key:"openid",
+				success(e){
+					if(e.data){
+						_this.appData.openId = e.data
+						_this.appData = JSON.stringify(_this.appData)
+					}
+				}
+			})
+			if(!options.type){
+				this.state = true	
+			}else{
+				this.state = false
+			}
+		},
+		methods: {
+			// 关闭小程序
+			closeXCX(){
+				wx.exitMiniProgram({success: (res) => {}})
+			},
+			launchAppError(e) {
+				Toast(e.detail.errMsg)
+			},
+			home(){
+				uni.redirectTo({
+				    url: `../index/index`
+				});
+			}
+			
+		},
+		onShow(options){
+		}
+	}
+</script>
+<style lang="scss" scoped>
+.mianBox{
+    height: 100%;
+    width: 100%;
+    color: #000;
+    box-sizing: border-box;
+	background-color: #F2F6FC;
+	position: fixed;
+    .contentBox{
+		width: 100%;
+		height: auto;
+		padding: 15px 20px;
+		box-sizing: border-box;
+		overflow: hidden;
+		.logo{
+			/deep/ .van-image{
+				margin:40px auto 0;
+				display: block;
+			}
+		}
+		.introduce{
+			text-align: center;
+			color: #000;
+			display: block;
+			/deep/ .van-col{
+				font-size: 20;
+				margin-top:20px;
+				letter-spacing: 2px;
+			}
+		}
+		.money{
+			text-align: center;
+			color: #000;
+			/deep/ .van-col{
+				font-size: 30px;
+				margin-top: 10px;
+				font-weight: 700;
+			}
+		}
+		.order_money{
+			text-align: center;
+			color: #ccc;
+			display: block;
+			/deep/ .van-col{
+				font-size: 20;
+				margin-top:10px;
+				letter-spacing: 2px;
+			}
+		}
+		/deep/ .van-button{
+			border-radius: 6px;
+			width: 100% !important;
+			margin-top:25px;
+			letter-spacing: 2px;
+			font-size: 18px;
+			height: 50px;
+		}
+		.order_wrap{
+			width:95%;
+			padding:10px 20px 20px 20px;
+			box-sizing: border-box;
+			width:95%;
+			margin:20px 2.5%;
+			background-color: #fff;
+			border-radius: 6px;
+			box-shadow: 0 2px 12px 0 #ccc;
+			display: block;
+			/deep/ .van-col{
+				font-size: 16px;
+				color:#ccc;
+				margin-top:10px;
+				display: block;
+			}
+			/deep/ .left{
+				text-align: left;
+			}
+			/deep/ .right{
+				text-align: right;
+			}
+		}
+		.pay_wrap{
+			width:95%;
+			margin:70px 2.5% 0;
+			.pay{
+				height: 50px;
+				font-size: 18px;
+				border-radius: 10px;
+				margin-top:40px;
+			}
+		}
+		
+    }
+}
+.pay{
+	background:#F22E3C;
+	color:#fff;
+}
+</style>
+
+

+ 5 - 1
pages/order/index.vue

@@ -9,7 +9,7 @@
 		</van-row>
 		<div class="pay_wrap">
 			<van-button class="pay"  color="#F22E3C" @tap="pay">支付</van-button>
-			<button class="pay" open-type="launchApp" app-parameter="appData"  @error="launchAppError" v-if="data.userId">返回APP</button>
+			<button class="pay" open-type="launchApp" app-parameter="appData"  @error="launchAppError" @click="closeXCX" v-if="data.userId">返回APP</button>
 			<!-- <button class="pay" open-type="launchApp" app-parameter="appData"  @error="launchAppError" >返回APP<navigator open-type="exit" target="miniProgram" style="margin:30px 0;display: block;">退出程序</navigator></button> -->
 		</div>
 		<van-toast id="van-toast" />
@@ -84,6 +84,10 @@
 			
 		},
 		methods: {
+			// 关闭小程序
+			closeXCX(){
+				wx.exitMiniProgram({success: (res) => {}})
+			},
 			pay(){
 				let _this = this
 				if(_this.data.openid && _this.data.openid != 'null'  ){

+ 5 - 2
pages/over/index.vue

@@ -6,8 +6,7 @@
 			<van-col span="24" class="introduce">支付完成</van-col>
 		</van-row>
 		<div class="pay_wrap">
-			<!-- <button class="pay" open-type="launchApp" app-parameter="wechat"  binderror="launchAppError">返回APP</button> -->
-			<button class="pay" open-type="launchApp" app-parameter="appData"  @error="launchAppError" v-if="state">返回APP</button>
+			<button class="pay" open-type="launchApp" app-parameter="appData"  @error="launchAppError" @click="closeXCX" v-if="state">返回APP</button>
 			<button class="pay"  v-if="!state" @tap ="home">返回首页</button>
 		</div>
 		<van-toast id="van-toast" />
@@ -50,6 +49,10 @@
 			}
 		},
 		methods: {
+			// 关闭小程序
+			closeXCX(){
+				wx.exitMiniProgram({success: (res) => {}})
+			},
 			launchAppError(e) {
 				Toast(e.detail.errMsg)
 			},

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/amount/index.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/index.js.map


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/over/index.js.map


+ 17 - 17
unpackage/dist/dev/mp-weixin/app.json

@@ -1,19 +1,19 @@
 {
-  "pages": [
-    "pages/index/index",
-    "pages/order/index",
-    "pages/over/index",
-    "pages/login/index",
-    "pages/amount/index"
-  ],
-  "subPackages": [],
-  "window": {
-    "navigationBarTextStyle": "white",
-    "navigationBarTitleText": "东信充值",
-    "navigationBarBackgroundColor": "#F22E3C",
-    "backgroundColor": "#F8F8F8"
-  },
-  "permission": {},
-  "usingComponents": {},
-  "sitemapLocation": "sitemap.json"
+    "pages": [
+        "pages/index/index",
+        "pages/order/index",
+        "pages/over/index",
+        "pages/login/index",
+        "pages/amount/index"
+    ],
+    "subPackages": [],
+    "window": {
+        "navigationBarTextStyle": "white",
+        "navigationBarTitleText": "东信充值",
+        "navigationBarBackgroundColor": "#F22E3C",
+        "backgroundColor": "#F8F8F8"
+    },
+    "permission": {},
+    "usingComponents": {},
+    "sitemapLocation": "sitemap.json"
 }

Fichier diff supprimé car celui-ci est trop grand
+ 22 - 23
unpackage/dist/dev/mp-weixin/common/main.js


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
unpackage/dist/dev/mp-weixin/common/vendor.js


Fichier diff supprimé car celui-ci est trop grand
+ 13 - 15
unpackage/dist/dev/mp-weixin/pages/amount/index.js


Fichier diff supprimé car celui-ci est trop grand
+ 13 - 15
unpackage/dist/dev/mp-weixin/pages/index/index.js


Fichier diff supprimé car celui-ci est trop grand
+ 13 - 15
unpackage/dist/dev/mp-weixin/pages/login/index.js


Fichier diff supprimé car celui-ci est trop grand
+ 13 - 15
unpackage/dist/dev/mp-weixin/pages/order/index.js


+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/order/index.wxml

@@ -1 +1 @@
-<view class="mianBox _div data-v-0ca91b30"><block wx:if="{{loading}}"><van-row class="contentBox data-v-0ca91b30" vue-id="3bc35b9e-1" data-com-type="wx" bind:__l="__l" vue-slots="{{['default']}}"><van-row vue-id="{{('3bc35b9e-2')+','+('3bc35b9e-1')}}" data-com-type="wx" class="data-v-0ca91b30" bind:__l="__l" vue-slots="{{['default']}}"><van-col class="logo data-v-0ca91b30" vue-id="{{('3bc35b9e-3')+','+('3bc35b9e-2')}}" span="24" data-com-type="wx" bind:__l="__l" vue-slots="{{['default']}}"><van-image vue-id="{{('3bc35b9e-4')+','+('3bc35b9e-3')}}" width="75" height="75" src="{{$root.m0}}" data-com-type="wx" class="data-v-0ca91b30" bind:__l="__l"></van-image></van-col><van-col class="introduce data-v-0ca91b30" vue-id="{{('3bc35b9e-5')+','+('3bc35b9e-2')}}" span="24" data-com-type="wx" bind:__l="__l" vue-slots="{{['default']}}">中国东信智慧园区平台</van-col><van-col class="money data-v-0ca91b30" vue-id="{{('3bc35b9e-6')+','+('3bc35b9e-2')}}" span="24" data-com-type="wx" bind:__l="__l" vue-slots="{{['default']}}">{{data.money}}</van-col><van-col class="order_money data-v-0ca91b30" vue-id="{{('3bc35b9e-7')+','+('3bc35b9e-2')}}" span="24" data-com-type="wx" bind:__l="__l" vue-slots="{{['default']}}">订单金额(元)</van-col></van-row><view class="pay_wrap _div data-v-0ca91b30"><van-button class="pay data-v-0ca91b30" vue-id="{{('3bc35b9e-8')+','+('3bc35b9e-1')}}" color="#F22E3C" data-event-opts="{{[['^tap',[['pay']]]]}}" data-com-type="wx" bind:tap="__e" bind:__l="__l" vue-slots="{{['default']}}">支付</van-button><block wx:if="{{data.userId}}"><button class="pay data-v-0ca91b30" open-type="launchApp" app-parameter="appData" data-event-opts="{{[['error',[['launchAppError',['$event']]]]]}}" binderror="__e">返回APP</button></block></view><van-toast vue-id="{{('3bc35b9e-9')+','+('3bc35b9e-1')}}" id="van-toast" data-com-type="wx" class="data-v-0ca91b30" bind:__l="__l"></van-toast></van-row></block></view>
+<view class="mianBox _div data-v-0ca91b30"><block wx:if="{{loading}}"><van-row class="contentBox data-v-0ca91b30" vue-id="3bc35b9e-1" data-com-type="wx" bind:__l="__l" vue-slots="{{['default']}}"><van-row vue-id="{{('3bc35b9e-2')+','+('3bc35b9e-1')}}" data-com-type="wx" class="data-v-0ca91b30" bind:__l="__l" vue-slots="{{['default']}}"><van-col class="logo data-v-0ca91b30" vue-id="{{('3bc35b9e-3')+','+('3bc35b9e-2')}}" span="24" data-com-type="wx" bind:__l="__l" vue-slots="{{['default']}}"><van-image vue-id="{{('3bc35b9e-4')+','+('3bc35b9e-3')}}" width="75" height="75" src="{{$root.m0}}" data-com-type="wx" class="data-v-0ca91b30" bind:__l="__l"></van-image></van-col><van-col class="introduce data-v-0ca91b30" vue-id="{{('3bc35b9e-5')+','+('3bc35b9e-2')}}" span="24" data-com-type="wx" bind:__l="__l" vue-slots="{{['default']}}">中国东信智慧园区平台</van-col><van-col class="money data-v-0ca91b30" vue-id="{{('3bc35b9e-6')+','+('3bc35b9e-2')}}" span="24" data-com-type="wx" bind:__l="__l" vue-slots="{{['default']}}">{{data.money}}</van-col><van-col class="order_money data-v-0ca91b30" vue-id="{{('3bc35b9e-7')+','+('3bc35b9e-2')}}" span="24" data-com-type="wx" bind:__l="__l" vue-slots="{{['default']}}">订单金额(元)</van-col></van-row><view class="pay_wrap _div data-v-0ca91b30"><van-button class="pay data-v-0ca91b30" vue-id="{{('3bc35b9e-8')+','+('3bc35b9e-1')}}" color="#F22E3C" data-event-opts="{{[['^tap',[['pay']]]]}}" data-com-type="wx" bind:tap="__e" bind:__l="__l" vue-slots="{{['default']}}">支付</van-button><block wx:if="{{data.userId}}"><button class="pay data-v-0ca91b30" open-type="launchApp" app-parameter="appData" data-event-opts="{{[['error',[['launchAppError',['$event']]]],['tap',[['closeXCX',['$event']]]]]}}" binderror="__e" bindtap="__e">返回APP</button></block></view><van-toast vue-id="{{('3bc35b9e-9')+','+('3bc35b9e-1')}}" id="van-toast" data-com-type="wx" class="data-v-0ca91b30" bind:__l="__l"></van-toast></van-row></block></view>

Fichier diff supprimé car celui-ci est trop grand
+ 13 - 15
unpackage/dist/dev/mp-weixin/pages/over/index.js


+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/over/index.wxml

@@ -1 +1 @@
-<view class="mianBox _div data-v-7697b190"><van-row class="contentBox data-v-7697b190" vue-id="5c5f0176-1" data-com-type="wx" bind:__l="__l" vue-slots="{{['default']}}"><van-row vue-id="{{('5c5f0176-2')+','+('5c5f0176-1')}}" data-com-type="wx" class="data-v-7697b190" bind:__l="__l" vue-slots="{{['default']}}"><van-col class="logo data-v-7697b190" vue-id="{{('5c5f0176-3')+','+('5c5f0176-2')}}" span="24" data-com-type="wx" bind:__l="__l" vue-slots="{{['default']}}"><van-image vue-id="{{('5c5f0176-4')+','+('5c5f0176-3')}}" width="75" height="75" src="{{$root.m0}}" data-com-type="wx" class="data-v-7697b190" bind:__l="__l"></van-image></van-col><van-col class="introduce data-v-7697b190" vue-id="{{('5c5f0176-5')+','+('5c5f0176-2')}}" span="24" data-com-type="wx" bind:__l="__l" vue-slots="{{['default']}}">支付完成</van-col></van-row><view class="pay_wrap _div data-v-7697b190"><block wx:if="{{state}}"><button class="pay data-v-7697b190" open-type="launchApp" app-parameter="appData" data-event-opts="{{[['error',[['launchAppError',['$event']]]]]}}" binderror="__e">返回APP</button></block><block wx:if="{{!state}}"><button data-event-opts="{{[['tap',[['home',['$event']]]]]}}" class="pay data-v-7697b190" bindtap="__e">返回首页</button></block></view><van-toast vue-id="{{('5c5f0176-6')+','+('5c5f0176-1')}}" id="van-toast" data-com-type="wx" class="data-v-7697b190" bind:__l="__l"></van-toast></van-row></view>
+<view class="mianBox _div data-v-7697b190"><van-row class="contentBox data-v-7697b190" vue-id="5c5f0176-1" data-com-type="wx" bind:__l="__l" vue-slots="{{['default']}}"><van-row vue-id="{{('5c5f0176-2')+','+('5c5f0176-1')}}" data-com-type="wx" class="data-v-7697b190" bind:__l="__l" vue-slots="{{['default']}}"><van-col class="logo data-v-7697b190" vue-id="{{('5c5f0176-3')+','+('5c5f0176-2')}}" span="24" data-com-type="wx" bind:__l="__l" vue-slots="{{['default']}}"><van-image vue-id="{{('5c5f0176-4')+','+('5c5f0176-3')}}" width="75" height="75" src="{{$root.m0}}" data-com-type="wx" class="data-v-7697b190" bind:__l="__l"></van-image></van-col><van-col class="introduce data-v-7697b190" vue-id="{{('5c5f0176-5')+','+('5c5f0176-2')}}" span="24" data-com-type="wx" bind:__l="__l" vue-slots="{{['default']}}">支付完成</van-col></van-row><view class="pay_wrap _div data-v-7697b190"><block wx:if="{{state}}"><button class="pay data-v-7697b190" open-type="launchApp" app-parameter="appData" data-event-opts="{{[['error',[['launchAppError',['$event']]]],['tap',[['closeXCX',['$event']]]]]}}" binderror="__e" bindtap="__e">返回APP</button></block><block wx:if="{{!state}}"><button data-event-opts="{{[['tap',[['home',['$event']]]]]}}" class="pay data-v-7697b190" bindtap="__e">返回首页</button></block></view><van-toast vue-id="{{('5c5f0176-6')+','+('5c5f0176-1')}}" id="van-toast" data-com-type="wx" class="data-v-7697b190" bind:__l="__l"></van-toast></van-row></view>

+ 28 - 34
unpackage/dist/dev/mp-weixin/project.config.json

@@ -1,45 +1,39 @@
 {
-  "description": "项目配置文件,详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "description": "项目配置文件",
   "packOptions": {
-    "ignore": [],
-    "include": []
+    "ignore": []
   },
   "setting": {
     "urlCheck": false,
-    "es6": true,
-    "coverView": true,
-    "postcss": true,
-    "lazyloadPlaceholderEnable": false,
-    "preloadBackgroundData": false,
-    "minified": true,
-    "autoAudits": false,
-    "uglifyFileName": false,
-    "uploadWithSourceMap": true,
-    "enhance": true,
-    "useMultiFrameRuntime": true,
-    "showShadowRootInWxmlPanel": true,
-    "packNpmManually": false,
-    "packNpmRelationList": [],
-    "minifyWXSS": true,
-    "useStaticServer": true,
-    "showES6CompileOption": false,
-    "checkInvalidKey": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    },
-    "disableUseStrict": false,
-    "useCompilerPlugins": false,
-    "minifyWXML": true
+    "es6": true
   },
   "compileType": "miniprogram",
-  "libVersion": "2.24.2",
+  "libVersion": "",
   "appid": "wx40274c2aaec24330",
   "projectname": "dx",
-  "condition": {},
-  "editorSetting": {
-    "tabIndent": "insertSpaces",
-    "tabSize": 2
+  "condition": {
+    "search": {
+      "current": -1,
+      "list": []
+    },
+    "conversation": {
+      "current": -1,
+      "list": []
+    },
+    "game": {
+      "current": -1,
+      "list": []
+    },
+    "miniprogram": {
+      "current": 0,
+      "list": [
+        {
+          "name": "",
+          "path": "",
+          "query": "",
+          "id": 0
+        }
+      ]
+    }
   }
 }

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff