소스 검색

返回app数据修改

wangtao 3 년 전
부모
커밋
90b5e2b6bb
51개의 변경된 파일9824개의 추가작업 그리고 45개의 파일을 삭제
  1. 324 0
      .history/pages/amount/index_20220607143625.vue
  2. 324 0
      .history/pages/amount/index_20220609125512.vue
  3. 324 0
      .history/pages/amount/index_20220609125601.vue
  4. 324 0
      .history/pages/amount/index_20220609125611.vue
  5. 324 0
      .history/pages/amount/index_20220609125621.vue
  6. 324 0
      .history/pages/amount/index_20220609125625.vue
  7. 324 0
      .history/pages/amount/index_20220609130109.vue
  8. 120 0
      .history/pages/index/index_20220609123928.vue
  9. 120 0
      .history/pages/index/index_20220609123933.vue
  10. 273 0
      .history/pages/order/index_20220609100202.vue
  11. 273 0
      .history/pages/order/index_20220609100227.vue
  12. 273 0
      .history/pages/order/index_20220609100238.vue
  13. 273 0
      .history/pages/order/index_20220609102336.vue
  14. 273 0
      .history/pages/order/index_20220609102345.vue
  15. 273 0
      .history/pages/order/index_20220609102824.vue
  16. 273 0
      .history/pages/order/index_20220609102825.vue
  17. 273 0
      .history/pages/order/index_20220609102826.vue
  18. 273 0
      .history/pages/order/index_20220609102827.vue
  19. 273 0
      .history/pages/order/index_20220609102834.vue
  20. 273 0
      .history/pages/order/index_20220609102835.vue
  21. 273 0
      .history/pages/order/index_20220609102843.vue
  22. 274 0
      .history/pages/order/index_20220609123800.vue
  23. 277 0
      .history/pages/order/index_20220609123847.vue
  24. 279 0
      .history/pages/order/index_20220609123920.vue
  25. 279 0
      .history/pages/order/index_20220609124548.vue
  26. 279 0
      .history/pages/order/index_20220609124619.vue
  27. 278 0
      .history/pages/order/index_20220609124651.vue
  28. 278 0
      .history/pages/order/index_20220609124731.vue
  29. 277 0
      .history/pages/order/index_20220609124745.vue
  30. 277 0
      .history/pages/order/index_20220609124814.vue
  31. 278 0
      .history/pages/order/index_20220609124840.vue
  32. 278 0
      .history/pages/order/index_20220609125010.vue
  33. 279 0
      .history/pages/order/index_20220609125107.vue
  34. 280 0
      .history/pages/order/index_20220609125228.vue
  35. 170 0
      .history/pages/over/index_20220609102312.vue
  36. 169 0
      .history/pages/over/index_20220609102322.vue
  37. 1 1
      pages/index/index.vue
  38. 10 3
      pages/order/index.vue
  39. 2 2
      pages/over/index.vue
  40. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  41. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/amount/index.js.map
  42. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  43. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map
  44. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/index.js.map
  45. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/over/index.js.map
  46. 1 1
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  47. 9 3
      unpackage/dist/dev/mp-weixin/pages/order/index.js
  48. 0 1
      unpackage/dist/dev/mp-weixin/pages/order/index.wxml
  49. 1 0
      unpackage/dist/dev/mp-weixin/pages/order/index.wxss
  50. 1 1
      unpackage/dist/dev/mp-weixin/pages/over/index.js
  51. 63 33
      unpackage/dist/dev/mp-weixin/project.config.json

+ 324 - 0
.history/pages/amount/index_20220607143625.vue

@@ -0,0 +1,324 @@
+<template>
+  <div class="mianBox">
+	<!-- <van-row class="balance">
+		<van-col span="24">余额:32.00元</van-col>
+	</van-row> -->
+	<van-row class="contentBox">
+		<van-row class="input_wrap">
+			<span>¥</span>
+			<input 
+				type="number"
+				placeholder="请输入充值金额( 元 )" 
+				class="input" 
+				@input="Input"
+				v-model="data.money"
+			/>
+		</van-row>
+	</van-row>
+    <van-row class="select_amount"  >
+        <van-col span="8" @tap="btn50"  :style="state1" data="50" >50</van-col>
+        <van-col style="margin-left:8%" span="8" @tap="btn100"  :style="state2" data="100">100</van-col>
+        <van-col style="margin-left:8%" span="8" @tap="btn150"  :style="state3" data="150">150</van-col>
+        <van-col span="8" @tap="btn200"  :style="state4" data="200">200</van-col>
+        <van-col style="margin-left:8%" span="8" @tap="btn250"  :style="state5" data="250">250</van-col>
+        <van-col style="margin-left:8%" span="8" @tap="btn300"  :style="state6" data="300">300</van-col>
+    </van-row>
+    <van-row class="pay_money" type="flex" justify="space-around">
+        <van-col span="12" class="left">到账金额</van-col>
+        <van-col span="12" class="right">¥{{data.money}}元</van-col>
+    </van-row>
+	
+    <!-- <van-row class="tip">
+		服务费 ¥0元<br>
+		费率 0%
+    </van-row> -->
+    <van-button class="amount"  color="#F22E3C" @tap="recharge">立即充值</van-button>
+	<van-dialog id="van-dialog" />
+	<van-toast id="van-toast" />
+   <!-- <van-loading size="24px" v-if = "loading" vertical style="z-index:999999;position:fixed;top:40%;left:0;right:0;" >加载中...</van-loading>
+    <van-overlay :show="loading"  style="z-index:100;position:fixed"/> -->
+  </div>
+</template>
+
+<script>
+import Toast from '../../wxcomponents/vant/weapp/dist/toast/toast';
+import Dialog from '../../wxcomponents/vant/weapp/dist/dialog/dialog'
+export default {
+  data() {
+    return {
+      show: false,
+      loading: false,
+      overlayShow: false,
+      env:null, //识别是否为扫描用户进入,以便直接进入支付跳转
+      state1:"color:#000;background: #ccc;",
+      state2:"color:#000;background: #ccc;",
+      state3:"color:#000;background: #ccc;",
+      state4:"color:#000;background: #ccc;",
+      state5:"color:#000;background: #ccc;",
+      state6:"color:#000;background: #ccc;",
+	  data:{
+		  money: "0",
+		  openid:null
+	  }
+    };
+  },
+  watch: {
+    money(val) {
+      // if (/^0[1-9]/.test(val)) {
+      //   this.data.money = val.substring(1);
+      // }
+    },
+  },
+  components: {
+    // [Field.name]: Field,
+    // [NumberKeyboard.name]: NumberKeyboard,
+    // [Dialog.name]: Dialog,
+    // [Toast.name]: Toast,
+  },
+  onLoad(options){
+	
+  },
+  created(){
+	let _this = this
+    uni.getStorage({
+    	key: 'openid',
+    	success: function (res) {
+    		_this.data.openid = res.data
+    	}
+    });
+  },
+	methods: {
+		recharge(){
+			if(this.data.money && this.data.money != 0 &&  this.data.money != "0.00"){
+				if(this.data.money.toString().indexOf(".")<1){
+					this.data.money = this.data.money + ".00"
+				}
+				if(this.data.openid){
+					//console.log(`"去支付页1"${JSON.stringify(this.data)}`)
+					uni.navigateTo({
+						url: `../order/index?params=${JSON.stringify(this.data)}`
+					});
+				}else{
+					//console.log(`"去支付页2"${JSON.stringify(this.data)}`)
+					uni.navigateTo({
+					    url: `../login/index?params=${JSON.stringify(this.data)}`
+					});
+				}
+			}else{
+				Toast('支付金额不能为空或0元');
+			}
+		},
+	Input(e){
+		let val = e.target.value.replace(/(^\s*)|(\s*$)/g, "")
+		if (!val) {
+			this.amount = '';
+			return
+		}
+		var reg = /[^\d.]/g
+	
+		// 只能是数字和小数点,不能是其他输入
+		val = val.replace(reg, "")
+		// // 保证第一位只能是数字,不能是点
+		val = val.replace(/^\./g, "");
+		// // 小数只能出现1位
+		val = val.replace(".", "$#$").replace(/\./g, "").replace("$#$", ".");
+		// // 小数点后面保留2位
+		val = val.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3');
+		if(val.indexOf("0") == 0){
+			if(val.length == 2){
+				val = "0."
+			}
+		}
+		this.$nextTick(() => {
+			this.data.money = val;
+		})
+		this.state1 = "color:#000;background: #ccc;",
+		this.state2 = "color:#000;background: #ccc;",
+		this.state3 = "color:#000;background: #ccc;",
+		this.state4 = "color:#000;background: #ccc;",
+		this.state5 = "color:#000;background: #ccc;",
+		this.state6 = "color:#000;background: #ccc;",
+		this.data.money = this.data.money + "";
+	},
+
+    jumpMode(){
+		//console.log(this.data.money)
+		if(this.data.money && this.data.money != 0 &&  this.data.money != "0.00"){
+			//this.pay(this.data.money, "A01", "3")
+		}else{
+			Toast('支付金额不能为空或0元');
+			Dialog.alert({
+				context: this,   // 增加this可用
+				selector:"#van-dialog",//选择器
+				title: '提示',
+				message: '充值金额不能为0元!'
+			}).then(() => {
+			  // on close
+			});
+		}
+    },
+    // recharge(){
+    //   this.jumpMode()
+    // },
+    btn50() {
+      this.state1 = "color:#fff;background:rgba(242, 46, 60, 1);",
+      this.state2 = "color:#000;background: #ccc;",
+      this.state3 = "color:#000;background: #ccc;",
+      this.state4 = "color:#000;background: #ccc;",
+      this.state5 = "color:#000;background: #ccc;",
+      this.state6 = "color:#000;background: #ccc;",
+      this.data.money = 50
+    },
+    btn100() {
+      this.state1 = "color:#000;background: #ccc;",
+      this.state2 = "color:#fff;background: rgba(242, 46, 60, 1);",
+      this.state3 = "color:#000;background: #ccc;",
+      this.state4 = "color:#000;background: #ccc;",
+      this.state5 = "color:#000;background: #ccc;",
+      this.state6 = "color:#000;background: #ccc;",
+      this.data.money = 100
+    },
+    btn150() {
+      this.state1 = "color:#000;background: #ccc;",
+      this.state2 = "color:#000;background: #ccc;",
+      this.state3 = "color:#fff;background: rgba(242, 46, 60, 1);",
+      this.state4 = "color:#000;background: #ccc;",
+      this.state5 = "color:#000;background: #ccc;",
+      this.state6 = "color:#000;background: #ccc;",
+      this.data.money = 150
+    },
+    btn200() {
+      this.state1 = "color:#000;background: #ccc;",
+      this.state2 = "color:#000;background: #ccc;",
+      this.state3 = "color:#000;background: #ccc;",
+      this.state4 = "color:#fff;background: rgba(242, 46, 60, 1);",
+      this.state5 = "color:#000;background: #ccc;",
+      this.state6 = "color:#000;background: #ccc;",
+      this.data.money = 200
+    },
+    btn250() {
+      this.state1 = "color:#000;background: #ccc;",
+      this.state2 = "color:#000;background: #ccc;",
+      this.state3 = "color:#000;background: #ccc;",
+      this.state4 = "color:#000;background: #ccc;",
+      this.state5 = "color:#fff;background: rgba(242, 46, 60, 1);",
+      this.state6 = "color:#000;background: #ccc;",
+      this.data.money = 250
+    },
+    btn300() {
+      this.state1 = "color:#000;background: #ccc;",
+      this.state2 = "color:#000;background: #ccc;",
+      this.state3 = "color:#000;background: #ccc;",
+      this.state4 = "color:#000;background: #ccc;",
+      this.state5 = "color:#000;background: #ccc;",
+      this.state6 = "color:#fff;background: rgba(242, 46, 60, 1);",
+      this.data.money = 300
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.mianBox {
+	width: 90%;
+	padding: 0 5% 0 5%;
+	height: 100%;
+	position: absolute;
+	// .balance{
+	// 	font-size: 16px;
+	// 	margin-top:20px;
+	// 	display: block;
+	// 	/deep/ .van-col{
+	// 		color:red;
+	// 		display: block;
+	// 	}
+	// }
+	.contentBox {
+		width: 90%;
+		position: absolute;
+		background-color: orange !important;
+		.input_wrap{
+			width:100%;
+			box-sizing: border-box;
+			border:1px solid #E6E6E6;
+			position: absolute;
+			margin-top:20px;
+			span{
+				font-size: 20px;
+				margin-left:10px;
+				color:rgba(242, 46, 60, 1);
+				display: inline-block;
+				vertical-align: middle;
+			}
+			input{
+				color:#000;
+				width:70%;
+				padding:8px 10px; 
+				display: inline-block;
+				vertical-align: middle;
+			}
+			::placeholder{
+				color:#000000;
+			}
+		}
+	}
+	.select_amount{
+		width:100%;
+		margin-top:60px;
+		display: block;
+		text-align: center;
+		/deep/ van-col{
+			padding:10px 0;
+			background-color: #ccc;
+			color:#000;
+			text-align: center;
+			font-size: 16px;
+			border-radius: 6px;
+			margin-top:20px;
+			float:left;
+			width:28%;
+		}
+		.van-col.active{
+			background: rgba(242, 46, 60, 1);
+			color:#fff;
+		}
+		/deep/ .van-col{
+			text-align: center !important;
+			width:100%;
+			display: block;
+			
+		}
+	}
+	.pay_money{
+	    font-size: 16px;
+	    margin:15px 0;
+		display: block;
+	    .left{
+	      text-align: left;
+	    }
+	    .right{
+	      text-align: right;
+	      color: rgba(242, 46, 60, 1);
+	    }
+	}
+	.tip{
+		font-size: 14px;
+		color: #CCC;
+	}
+	/deep/ .van-button{
+		border-radius: 6px;
+		width: 100% !important;
+	}
+	.amount{
+		position: absolute;
+		bottom: 25px;
+		width:90%;
+		height: 50px;
+		font-size: 18px;
+		border-radius: 10px;
+	}
+	.van-field__label{
+		color:rgba(242, 46, 60, 1) !important;
+	}
+}
+
+</style>

+ 324 - 0
.history/pages/amount/index_20220609125512.vue

@@ -0,0 +1,324 @@
+<template>
+  <div class="mianBox">
+	<!-- <van-row class="balance">
+		<van-col span="24">余额:32.00元</van-col>
+	</van-row> -->
+	<van-row class="contentBox">
+		<van-row class="input_wrap">
+			<span>¥</span>
+			<input 
+				type="number"
+				placeholder="请输入充值金额( 元 )" 
+				class="input" 
+				@input="Input"
+				v-model="data.money"
+			/>
+		</van-row>
+	</van-row>
+    <van-row class="select_amount"  >
+        <van-col span="8" @tap="btn50"  :style="state1" data="50" >50</van-col>
+        <van-col style="margin-left:8%" span="8" @tap="btn100"  :style="state2" data="100">100</van-col>
+        <van-col style="margin-left:8%" span="8" @tap="btn150"  :style="state3" data="150">150</van-col>
+        <van-col span="8" @tap="btn200"  :style="state4" data="200">200</van-col>
+        <van-col style="margin-left:8%" span="8" @tap="btn250"  :style="state5" data="250">250</van-col>
+        <van-col style="margin-left:8%" span="8" @tap="btn300"  :style="state6" data="300">300</van-col>
+    </van-row>
+    <van-row class="pay_money" type="flex" justify="space-around">
+        <van-col span="12" class="left">到账金额</van-col>
+        <van-col span="12" class="right">¥{{data.money}}元</van-col>
+    </van-row>
+	
+    <!-- <van-row class="tip">
+		服务费 ¥0元<br>
+		费率 0%
+    </van-row> -->
+    <van-button class="amount"  color="#F22E3C" @tap="recharge">立即充值</van-button>
+	<van-dialog id="van-dialog" />
+	<van-toast id="van-toast" />
+   <!-- <van-loading size="24px" v-if = "loading" vertical style="z-index:999999;position:fixed;top:40%;left:0;right:0;" >加载中...</van-loading>
+    <van-overlay :show="loading"  style="z-index:100;position:fixed"/> -->
+  </div>
+</template>
+
+<script>
+import Toast from '../../wxcomponents/vant/weapp/dist/toast/toast';
+import Dialog from '../../wxcomponents/vant/weapp/dist/dialog/dialog'
+export default {
+  data() {
+    return {
+      show: false,
+      loading: false,
+      overlayShow: false,
+      env:null, //识别是否为扫描用户进入,以便直接进入支付跳转
+      state1:"color:#000;background: #ccc;",
+      state2:"color:#000;background: #ccc;",
+      state3:"color:#000;background: #ccc;",
+      state4:"color:#000;background: #ccc;",
+      state5:"color:#000;background: #ccc;",
+      state6:"color:#000;background: #ccc;",
+	  data:{
+		  money: "0",
+		  openid:null
+	  }
+    };
+  },
+  watch: {
+    money(val) {
+      // if (/^0[1-9]/.test(val)) {
+      //   this.data.money = val.substring(1);
+      // }
+    },
+  },
+  components: {
+    // [Field.name]: Field,
+    // [NumberKeyboard.name]: NumberKeyboard,
+    // [Dialog.name]: Dialog,
+    // [Toast.name]: Toast,
+  },
+  onLoad(options){
+	
+  },
+  created(){
+	let _this = this
+    uni.getStorage({
+    	key: 'openid',
+    	success: function (res) {
+    		_this.data.openid = res.data
+    	}
+    });
+  },
+	methods: {
+		recharge(){
+			if(this.data.money && this.data.money != 0 &&  this.data.money != "0.00"){
+				if(this.data.money.toString().indexOf(".")<1){
+					this.data.money = this.data.money + ".00"
+				}
+				if(this.data.openid){
+					//console.log(`"去支付页1"${JSON.stringify(this.data)}`)
+					uni.navigateTo({
+						url: `../order/index?params=${JSON.stringify(this.data)}`
+					});
+				}else{
+					//console.log(`"去支付页2"${JSON.stringify(this.data)}`)
+					uni.navigateTo({
+					    url: `../login/index?params=${JSON.stringify(this.data)}`
+					});
+				}
+			}else{
+				Toast('支付金额不能为空或0元');
+			}
+		},
+	Input(e){
+		let val = e.target.value.replace(/(^\s*)|(\s*$)/g, "")
+		if (!val) {
+			this.amount = '';
+			return
+		}
+		var reg = /[^\d.]/g
+	
+		// 只能是数字和小数点,不能是其他输入
+		val = val.replace(reg, "")
+		// // 保证第一位只能是数字,不能是点
+		val = val.replace(/^\./g, "");
+		// // 小数只能出现1位
+		val = val.replace(".", "$#$").replace(/\./g, "").replace("$#$", ".");
+		// // 小数点后面保留2位
+		val = val.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3');
+		if(val.indexOf("0") == 0){
+			if(val.length == 2){
+				val = "0."
+			}
+		}
+		this.$nextTick(() => {
+			this.data.money = val;
+		})
+		this.state1 = "color:#000;background: #ccc;",
+		this.state2 = "color:#000;background: #ccc;",
+		this.state3 = "color:#000;background: #ccc;",
+		this.state4 = "color:#000;background: #ccc;",
+		this.state5 = "color:#000;background: #ccc;",
+		this.state6 = "color:#000;background: #ccc;",
+		this.data.money = this.data.money + "";
+	},
+
+    jumpMode(){
+		//console.log(this.data.money)
+		if(this.data.money && this.data.money != 0 &&  this.data.money != "0.00"){
+			//this.pay(this.data.money, "A01", "3")
+		}else{
+			Toast('支付金额不能为空或0元');
+			Dialog.alert({
+				context: this,   // 增加this可用
+				selector:"#van-dialog",//选择器
+				title: '提示',
+				message: '充值金额不能为0元!'
+			}).then(() => {
+			  // on close
+			});
+		}
+    },
+    // recharge(){
+    //   this.jumpMode()
+    // },
+    btn50() {
+      this.state1 = "color:#fff;background:rgba(242, 46, 60, 1);",
+      this.state2 = "color:#000;background: #ccc;",
+      this.state3 = "color:#000;background: #ccc;",
+      this.state4 = "color:#000;background: #ccc;",
+      this.state5 = "color:#000;background: #ccc;",
+      this.state6 = "color:#000;background: #ccc;",
+      this.data.money = 50
+    },
+    btn100() {
+      this.state1 = "color:#000;background: #ccc;",
+      this.state2 = "color:#fff;background: rgba(242, 46, 60, 1);",
+      this.state3 = "color:#000;background: #ccc;",
+      this.state4 = "color:#000;background: #ccc;",
+      this.state5 = "color:#000;background: #ccc;",
+      this.state6 = "color:#000;background: #ccc;",
+      this.data.money = 100
+    },
+    btn150() {
+      this.state1 = "color:#000;background: #ccc;",
+      this.state2 = "color:#000;background: #ccc;",
+      this.state3 = "color:#fff;background: rgba(242, 46, 60, 1);",
+      this.state4 = "color:#000;background: #ccc;",
+      this.state5 = "color:#000;background: #ccc;",
+      this.state6 = "color:#000;background: #ccc;",
+      this.data.money = 150
+    },
+    btn200() {
+      this.state1 = "color:#000;background: #ccc;",
+      this.state2 = "color:#000;background: #ccc;",
+      this.state3 = "color:#000;background: #ccc;",
+      this.state4 = "color:#fff;background: rgba(242, 46, 60, 1);",
+      this.state5 = "color:#000;background: #ccc;",
+      this.state6 = "color:#000;background: #ccc;",
+      this.data.money = 200
+    },
+    btn250() {
+      this.state1 = "color:#000;background: #ccc;",
+      this.state2 = "color:#000;background: #ccc;",
+      this.state3 = "color:#000;background: #ccc;",
+      this.state4 = "color:#000;background: #ccc;",
+      this.state5 = "color:#fff;background: rgba(242, 46, 60, 1);",
+      this.state6 = "color:#000;background: #ccc;",
+      this.data.money = 250
+    },
+    btn300() {
+      this.state1 = "color:#000;background: #ccc;",
+      this.state2 = "color:#000;background: #ccc;",
+      this.state3 = "color:#000;background: #ccc;",
+      this.state4 = "color:#000;background: #ccc;",
+      this.state5 = "color:#000;background: #ccc;",
+      this.state6 = "color:#fff;background: rgba(242, 46, 60, 1);",
+      this.data.money = 300
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.mianBox {
+	width: 90%;
+	padding: 0 5% 0 5%;
+	height: 100%;
+	position: absolute;
+	// .balance{
+	// 	font-size: 16px;
+	// 	margin-top:20px;
+	// 	display: block;
+	// 	/deep/ .van-col{
+	// 		color:red;
+	// 		display: block;
+	// 	}
+	// }
+	.contentBox {
+		width: 90%;
+		position: absolute;
+		background-color: orange !important;
+		.input_wrap{
+			width:100%;
+			box-sizing: border-box;
+			border:1px solid #E6E6E6;
+			position: absolute;
+			margin-top:20px;
+			span{
+				font-size: 20px;
+				margin-left:10px;
+				color:rgba(242, 46, 60, 1);
+				display: inline-block;
+				vertical-align: middle;
+			}
+			input{
+				color:#000;
+				width:70%;
+				padding:8px 10px; 
+				display: inline-block;
+				vertical-align: middle;
+			}
+			::placeholder{
+				color:#000000;
+			}
+		}
+	}
+	.select_amount{
+		width:100%;
+		margin-top:60px;
+		display: block;
+		text-align: center;
+		/deep/ van-col{
+			padding:10px 0;
+			background-color: #ccc;
+			color:#000;
+			text-align: center;
+			font-size: 16px;
+			border-radius: 6px;
+			margin-top:20px;
+			float:left;
+			width:28%;
+		}
+		.van-col.active{
+			background: rgba(242, 46, 60, 1);
+			color:#fff;
+		}
+		/deep/ .van-col{
+			text-align: center !important;
+			width:100%;
+			display: block;
+			
+		}
+	}
+	.pay_money{
+	    font-size: 16px;
+	    margin:15px 0;
+		display: block;
+	    .left{
+	      text-align: left;
+	    }
+	    .right{
+	      text-align: right;
+	      color: rgba(242, 46, 60, 1);
+	    }
+	}
+	.tip{
+		font-size: 14px;
+		color: #CCC;
+	}
+	/deep/ .van-button{
+		border-radius: 6px;
+		width: 100% !important;
+	}
+	.amount{
+		position: absolute;
+		bottom: 25px;
+		width:90%;
+		height: 50px;
+		font-size: 18px;
+		border-radius: 10px;
+	}
+	.van-field__label{
+		color:rgba(242, 46, 60, 1) !important;
+	}
+}
+
+</style>

+ 324 - 0
.history/pages/amount/index_20220609125601.vue

@@ -0,0 +1,324 @@
+<template>
+  <div class="mianBox">
+	<!-- <van-row class="balance">
+		<van-col span="24">余额:32.00元</van-col>
+	</van-row> -->
+	<van-row class="contentBox">
+		<van-row class="input_wrap">
+			<span>¥</span>
+			<input 
+				type="number"
+				placeholder="请输入充值金额( 元 )" 
+				class="input" 
+				@input="Input"
+				v-model="data.money"
+			/>
+		</van-row>
+	</van-row>
+    <van-row class="select_amount"  >
+        <van-col span="8" @tap="btn50"  :style="state1" data="50" >50</van-col>
+        <van-col style="margin-left:8%" span="8" @tap="btn100"  :style="state2" data="100">100</van-col>
+        <van-col style="margin-left:8%" span="8" @tap="btn150"  :style="state3" data="150">150</van-col>
+        <van-col span="8" @tap="btn200"  :style="state4" data="200">200</van-col>
+        <van-col style="margin-left:8%" span="8" @tap="btn250"  :style="state5" data="250">250</van-col>
+        <van-col style="margin-left:8%" span="8" @tap="btn300"  :style="state6" data="300">300</van-col>
+    </van-row>
+    <van-row class="pay_money" type="flex" justify="space-around">
+        <van-col span="12" class="left">到账金额</van-col>
+        <van-col span="12" class="right">¥{{data.money}}元</van-col>
+    </van-row>
+	
+    <!-- <van-row class="tip">
+		服务费 ¥0元<br>
+		费率 0%
+    </van-row> -->
+    <!-- <van-button class="amount"  color="#F22E3C" @tap="recharge">立即充值</van-button> -->
+	<van-dialog id="van-dialog" />
+	<van-toast id="van-toast" />
+   <!-- <van-loading size="24px" v-if = "loading" vertical style="z-index:999999;position:fixed;top:40%;left:0;right:0;" >加载中...</van-loading>
+    <van-overlay :show="loading"  style="z-index:100;position:fixed"/> -->
+  </div>
+</template>
+
+<script>
+import Toast from '../../wxcomponents/vant/weapp/dist/toast/toast';
+import Dialog from '../../wxcomponents/vant/weapp/dist/dialog/dialog'
+export default {
+  data() {
+    return {
+      show: false,
+      loading: false,
+      overlayShow: false,
+      env:null, //识别是否为扫描用户进入,以便直接进入支付跳转
+      state1:"color:#000;background: #ccc;",
+      state2:"color:#000;background: #ccc;",
+      state3:"color:#000;background: #ccc;",
+      state4:"color:#000;background: #ccc;",
+      state5:"color:#000;background: #ccc;",
+      state6:"color:#000;background: #ccc;",
+	  data:{
+		  money: "0",
+		  openid:null
+	  }
+    };
+  },
+  watch: {
+    money(val) {
+      // if (/^0[1-9]/.test(val)) {
+      //   this.data.money = val.substring(1);
+      // }
+    },
+  },
+  components: {
+    // [Field.name]: Field,
+    // [NumberKeyboard.name]: NumberKeyboard,
+    // [Dialog.name]: Dialog,
+    // [Toast.name]: Toast,
+  },
+  onLoad(options){
+	
+  },
+  created(){
+	let _this = this
+    uni.getStorage({
+    	key: 'openid',
+    	success: function (res) {
+    		_this.data.openid = res.data
+    	}
+    });
+  },
+	methods: {
+		recharge(){
+			if(this.data.money && this.data.money != 0 &&  this.data.money != "0.00"){
+				if(this.data.money.toString().indexOf(".")<1){
+					this.data.money = this.data.money + ".00"
+				}
+				if(this.data.openid){
+					//console.log(`"去支付页1"${JSON.stringify(this.data)}`)
+					uni.navigateTo({
+						url: `../order/index?params=${JSON.stringify(this.data)}`
+					});
+				}else{
+					//console.log(`"去支付页2"${JSON.stringify(this.data)}`)
+					uni.navigateTo({
+					    url: `../login/index?params=${JSON.stringify(this.data)}`
+					});
+				}
+			}else{
+				Toast('支付金额不能为空或0元');
+			}
+		},
+	Input(e){
+		let val = e.target.value.replace(/(^\s*)|(\s*$)/g, "")
+		if (!val) {
+			this.amount = '';
+			return
+		}
+		var reg = /[^\d.]/g
+	
+		// 只能是数字和小数点,不能是其他输入
+		val = val.replace(reg, "")
+		// // 保证第一位只能是数字,不能是点
+		val = val.replace(/^\./g, "");
+		// // 小数只能出现1位
+		val = val.replace(".", "$#$").replace(/\./g, "").replace("$#$", ".");
+		// // 小数点后面保留2位
+		val = val.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3');
+		if(val.indexOf("0") == 0){
+			if(val.length == 2){
+				val = "0."
+			}
+		}
+		this.$nextTick(() => {
+			this.data.money = val;
+		})
+		this.state1 = "color:#000;background: #ccc;",
+		this.state2 = "color:#000;background: #ccc;",
+		this.state3 = "color:#000;background: #ccc;",
+		this.state4 = "color:#000;background: #ccc;",
+		this.state5 = "color:#000;background: #ccc;",
+		this.state6 = "color:#000;background: #ccc;",
+		this.data.money = this.data.money + "";
+	},
+
+    jumpMode(){
+		//console.log(this.data.money)
+		if(this.data.money && this.data.money != 0 &&  this.data.money != "0.00"){
+			//this.pay(this.data.money, "A01", "3")
+		}else{
+			Toast('支付金额不能为空或0元');
+			Dialog.alert({
+				context: this,   // 增加this可用
+				selector:"#van-dialog",//选择器
+				title: '提示',
+				message: '充值金额不能为0元!'
+			}).then(() => {
+			  // on close
+			});
+		}
+    },
+    // recharge(){
+    //   this.jumpMode()
+    // },
+    btn50() {
+      this.state1 = "color:#fff;background:rgba(242, 46, 60, 1);",
+      this.state2 = "color:#000;background: #ccc;",
+      this.state3 = "color:#000;background: #ccc;",
+      this.state4 = "color:#000;background: #ccc;",
+      this.state5 = "color:#000;background: #ccc;",
+      this.state6 = "color:#000;background: #ccc;",
+      this.data.money = 50
+    },
+    btn100() {
+      this.state1 = "color:#000;background: #ccc;",
+      this.state2 = "color:#fff;background: rgba(242, 46, 60, 1);",
+      this.state3 = "color:#000;background: #ccc;",
+      this.state4 = "color:#000;background: #ccc;",
+      this.state5 = "color:#000;background: #ccc;",
+      this.state6 = "color:#000;background: #ccc;",
+      this.data.money = 100
+    },
+    btn150() {
+      this.state1 = "color:#000;background: #ccc;",
+      this.state2 = "color:#000;background: #ccc;",
+      this.state3 = "color:#fff;background: rgba(242, 46, 60, 1);",
+      this.state4 = "color:#000;background: #ccc;",
+      this.state5 = "color:#000;background: #ccc;",
+      this.state6 = "color:#000;background: #ccc;",
+      this.data.money = 150
+    },
+    btn200() {
+      this.state1 = "color:#000;background: #ccc;",
+      this.state2 = "color:#000;background: #ccc;",
+      this.state3 = "color:#000;background: #ccc;",
+      this.state4 = "color:#fff;background: rgba(242, 46, 60, 1);",
+      this.state5 = "color:#000;background: #ccc;",
+      this.state6 = "color:#000;background: #ccc;",
+      this.data.money = 200
+    },
+    btn250() {
+      this.state1 = "color:#000;background: #ccc;",
+      this.state2 = "color:#000;background: #ccc;",
+      this.state3 = "color:#000;background: #ccc;",
+      this.state4 = "color:#000;background: #ccc;",
+      this.state5 = "color:#fff;background: rgba(242, 46, 60, 1);",
+      this.state6 = "color:#000;background: #ccc;",
+      this.data.money = 250
+    },
+    btn300() {
+      this.state1 = "color:#000;background: #ccc;",
+      this.state2 = "color:#000;background: #ccc;",
+      this.state3 = "color:#000;background: #ccc;",
+      this.state4 = "color:#000;background: #ccc;",
+      this.state5 = "color:#000;background: #ccc;",
+      this.state6 = "color:#fff;background: rgba(242, 46, 60, 1);",
+      this.data.money = 300
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.mianBox {
+	width: 90%;
+	padding: 0 5% 0 5%;
+	height: 100%;
+	position: absolute;
+	// .balance{
+	// 	font-size: 16px;
+	// 	margin-top:20px;
+	// 	display: block;
+	// 	/deep/ .van-col{
+	// 		color:red;
+	// 		display: block;
+	// 	}
+	// }
+	.contentBox {
+		width: 90%;
+		position: absolute;
+		background-color: orange !important;
+		.input_wrap{
+			width:100%;
+			box-sizing: border-box;
+			border:1px solid #E6E6E6;
+			position: absolute;
+			margin-top:20px;
+			span{
+				font-size: 20px;
+				margin-left:10px;
+				color:rgba(242, 46, 60, 1);
+				display: inline-block;
+				vertical-align: middle;
+			}
+			input{
+				color:#000;
+				width:70%;
+				padding:8px 10px; 
+				display: inline-block;
+				vertical-align: middle;
+			}
+			::placeholder{
+				color:#000000;
+			}
+		}
+	}
+	.select_amount{
+		width:100%;
+		margin-top:60px;
+		display: block;
+		text-align: center;
+		/deep/ van-col{
+			padding:10px 0;
+			background-color: #ccc;
+			color:#000;
+			text-align: center;
+			font-size: 16px;
+			border-radius: 6px;
+			margin-top:20px;
+			float:left;
+			width:28%;
+		}
+		.van-col.active{
+			background: rgba(242, 46, 60, 1);
+			color:#fff;
+		}
+		/deep/ .van-col{
+			text-align: center !important;
+			width:100%;
+			display: block;
+			
+		}
+	}
+	.pay_money{
+	    font-size: 16px;
+	    margin:15px 0;
+		display: block;
+	    .left{
+	      text-align: left;
+	    }
+	    .right{
+	      text-align: right;
+	      color: rgba(242, 46, 60, 1);
+	    }
+	}
+	.tip{
+		font-size: 14px;
+		color: #CCC;
+	}
+	/deep/ .van-button{
+		border-radius: 6px;
+		width: 100% !important;
+	}
+	.amount{
+		position: absolute;
+		bottom: 25px;
+		width:90%;
+		height: 50px;
+		font-size: 18px;
+		border-radius: 10px;
+	}
+	.van-field__label{
+		color:rgba(242, 46, 60, 1) !important;
+	}
+}
+
+</style>

+ 324 - 0
.history/pages/amount/index_20220609125611.vue

@@ -0,0 +1,324 @@
+<template>
+  <div class="mianBox">
+	<!-- <van-row class="balance">
+		<van-col span="24">余额:32.00元</van-col>
+	</van-row> -->
+	<van-row class="contentBox">
+		<van-row class="input_wrap">
+			<span>¥</span>
+			<input 
+				type="number"
+				placeholder="请输入充值金额( 元 )" 
+				class="input" 
+				@input="Input"
+				v-model="data.money"
+			/>
+		</van-row>
+	</van-row>
+    <van-row class="select_amount"  >
+        <van-col span="8" @tap="btn50"  :style="state1" data="50" >50</van-col>
+        <van-col style="margin-left:8%" span="8" @tap="btn100"  :style="state2" data="100">100</van-col>
+        <van-col style="margin-left:8%" span="8" @tap="btn150"  :style="state3" data="150">150</van-col>
+        <van-col span="8" @tap="btn200"  :style="state4" data="200">200</van-col>
+        <van-col style="margin-left:8%" span="8" @tap="btn250"  :style="state5" data="250">250</van-col>
+        <van-col style="margin-left:8%" span="8" @tap="btn300"  :style="state6" data="300">300</van-col>
+    </van-row>
+    <van-row class="pay_money" type="flex" justify="space-around">
+        <van-col span="12" class="left">到账金额</van-col>
+        <van-col span="12" class="right">¥{{data.money}}元</van-col>
+    </van-row>
+	
+    <!-- <van-row class="tip">
+		服务费 ¥0元<br>
+		费率 0%
+    </van-row> -->
+    <van-button class="amount"  color="#F22E3C" @tap="recharge">立即充值</van-button>
+	<van-dialog id="van-dialog" />
+	<van-toast id="van-toast" />
+   <!-- <van-loading size="24px" v-if = "loading" vertical style="z-index:999999;position:fixed;top:40%;left:0;right:0;" >加载中...</van-loading>
+    <van-overlay :show="loading"  style="z-index:100;position:fixed"/> -->
+  </div>
+</template>
+
+<script>
+import Toast from '../../wxcomponents/vant/weapp/dist/toast/toast';
+import Dialog from '../../wxcomponents/vant/weapp/dist/dialog/dialog'
+export default {
+  data() {
+    return {
+      show: false,
+      loading: false,
+      overlayShow: false,
+      env:null, //识别是否为扫描用户进入,以便直接进入支付跳转
+      state1:"color:#000;background: #ccc;",
+      state2:"color:#000;background: #ccc;",
+      state3:"color:#000;background: #ccc;",
+      state4:"color:#000;background: #ccc;",
+      state5:"color:#000;background: #ccc;",
+      state6:"color:#000;background: #ccc;",
+	  data:{
+		  money: "0",
+		  openid:null
+	  }
+    };
+  },
+  watch: {
+    money(val) {
+      // if (/^0[1-9]/.test(val)) {
+      //   this.data.money = val.substring(1);
+      // }
+    },
+  },
+  components: {
+    // [Field.name]: Field,
+    // [NumberKeyboard.name]: NumberKeyboard,
+    // [Dialog.name]: Dialog,
+    // [Toast.name]: Toast,
+  },
+  onLoad(options){
+	
+  },
+  created(){
+	let _this = this
+    uni.getStorage({
+    	key: 'openid',
+    	success: function (res) {
+    		_this.data.openid = res.data
+    	}
+    });
+  },
+	methods: {
+		recharge(){
+			if(this.data.money && this.data.money != 0 &&  this.data.money != "0.00"){
+				if(this.data.money.toString().indexOf(".")<1){
+					this.data.money = this.data.money + ".00"
+				}
+				if(this.data.openid){
+					//console.log(`"去支付页1"${JSON.stringify(this.data)}`)
+					uni.navigateTo({
+						url: `../order/index?params=${JSON.stringify(this.data)}`
+					});
+				}else{
+					//console.log(`"去支付页2"${JSON.stringify(this.data)}`)
+					uni.navigateTo({
+					    url: `../login/index?params=${JSON.stringify(this.data)}`
+					});
+				}
+			}else{
+				Toast('支付金额不能为空或0元');
+			}
+		},
+	Input(e){
+		let val = e.target.value.replace(/(^\s*)|(\s*$)/g, "")
+		if (!val) {
+			this.amount = '';
+			return
+		}
+		var reg = /[^\d.]/g
+	
+		// 只能是数字和小数点,不能是其他输入
+		val = val.replace(reg, "")
+		// // 保证第一位只能是数字,不能是点
+		val = val.replace(/^\./g, "");
+		// // 小数只能出现1位
+		val = val.replace(".", "$#$").replace(/\./g, "").replace("$#$", ".");
+		// // 小数点后面保留2位
+		val = val.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3');
+		if(val.indexOf("0") == 0){
+			if(val.length == 2){
+				val = "0."
+			}
+		}
+		this.$nextTick(() => {
+			this.data.money = val;
+		})
+		this.state1 = "color:#000;background: #ccc;",
+		this.state2 = "color:#000;background: #ccc;",
+		this.state3 = "color:#000;background: #ccc;",
+		this.state4 = "color:#000;background: #ccc;",
+		this.state5 = "color:#000;background: #ccc;",
+		this.state6 = "color:#000;background: #ccc;",
+		this.data.money = this.data.money + "";
+	},
+
+    jumpMode(){
+		//console.log(this.data.money)
+		if(this.data.money && this.data.money != 0 &&  this.data.money != "0.00"){
+			//this.pay(this.data.money, "A01", "3")
+		}else{
+			Toast('支付金额不能为空或0元');
+			Dialog.alert({
+				context: this,   // 增加this可用
+				selector:"#van-dialog",//选择器
+				title: '提示',
+				message: '充值金额不能为0元!'
+			}).then(() => {
+			  // on close
+			});
+		}
+    },
+    // recharge(){
+    //   this.jumpMode()
+    // },
+    btn50() {
+      this.state1 = "color:#fff;background:rgba(242, 46, 60, 1);",
+      this.state2 = "color:#000;background: #ccc;",
+      this.state3 = "color:#000;background: #ccc;",
+      this.state4 = "color:#000;background: #ccc;",
+      this.state5 = "color:#000;background: #ccc;",
+      this.state6 = "color:#000;background: #ccc;",
+      this.data.money = 50
+    },
+    btn100() {
+      this.state1 = "color:#000;background: #ccc;",
+      this.state2 = "color:#fff;background: rgba(242, 46, 60, 1);",
+      this.state3 = "color:#000;background: #ccc;",
+      this.state4 = "color:#000;background: #ccc;",
+      this.state5 = "color:#000;background: #ccc;",
+      this.state6 = "color:#000;background: #ccc;",
+      this.data.money = 100
+    },
+    btn150() {
+      this.state1 = "color:#000;background: #ccc;",
+      this.state2 = "color:#000;background: #ccc;",
+      this.state3 = "color:#fff;background: rgba(242, 46, 60, 1);",
+      this.state4 = "color:#000;background: #ccc;",
+      this.state5 = "color:#000;background: #ccc;",
+      this.state6 = "color:#000;background: #ccc;",
+      this.data.money = 150
+    },
+    btn200() {
+      this.state1 = "color:#000;background: #ccc;",
+      this.state2 = "color:#000;background: #ccc;",
+      this.state3 = "color:#000;background: #ccc;",
+      this.state4 = "color:#fff;background: rgba(242, 46, 60, 1);",
+      this.state5 = "color:#000;background: #ccc;",
+      this.state6 = "color:#000;background: #ccc;",
+      this.data.money = 200
+    },
+    btn250() {
+      this.state1 = "color:#000;background: #ccc;",
+      this.state2 = "color:#000;background: #ccc;",
+      this.state3 = "color:#000;background: #ccc;",
+      this.state4 = "color:#000;background: #ccc;",
+      this.state5 = "color:#fff;background: rgba(242, 46, 60, 1);",
+      this.state6 = "color:#000;background: #ccc;",
+      this.data.money = 250
+    },
+    btn300() {
+      this.state1 = "color:#000;background: #ccc;",
+      this.state2 = "color:#000;background: #ccc;",
+      this.state3 = "color:#000;background: #ccc;",
+      this.state4 = "color:#000;background: #ccc;",
+      this.state5 = "color:#000;background: #ccc;",
+      this.state6 = "color:#fff;background: rgba(242, 46, 60, 1);",
+      this.data.money = 300
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.mianBox {
+	width: 90%;
+	padding: 0 5% 0 5%;
+	height: 100%;
+	position: absolute;
+	// .balance{
+	// 	font-size: 16px;
+	// 	margin-top:20px;
+	// 	display: block;
+	// 	/deep/ .van-col{
+	// 		color:red;
+	// 		display: block;
+	// 	}
+	// }
+	.contentBox {
+		width: 90%;
+		position: absolute;
+		background-color: orange !important;
+		.input_wrap{
+			width:100%;
+			box-sizing: border-box;
+			border:1px solid #E6E6E6;
+			position: absolute;
+			margin-top:20px;
+			span{
+				font-size: 20px;
+				margin-left:10px;
+				color:rgba(242, 46, 60, 1);
+				display: inline-block;
+				vertical-align: middle;
+			}
+			input{
+				color:#000;
+				width:70%;
+				padding:8px 10px; 
+				display: inline-block;
+				vertical-align: middle;
+			}
+			::placeholder{
+				color:#000000;
+			}
+		}
+	}
+	.select_amount{
+		width:100%;
+		margin-top:60px;
+		display: block;
+		text-align: center;
+		/deep/ van-col{
+			padding:10px 0;
+			background-color: #ccc;
+			color:#000;
+			text-align: center;
+			font-size: 16px;
+			border-radius: 6px;
+			margin-top:20px;
+			float:left;
+			width:28%;
+		}
+		.van-col.active{
+			background: rgba(242, 46, 60, 1);
+			color:#fff;
+		}
+		/deep/ .van-col{
+			text-align: center !important;
+			width:100%;
+			display: block;
+			
+		}
+	}
+	.pay_money{
+	    font-size: 16px;
+	    margin:15px 0;
+		display: block;
+	    .left{
+	      text-align: left;
+	    }
+	    .right{
+	      text-align: right;
+	      color: rgba(242, 46, 60, 1);
+	    }
+	}
+	.tip{
+		font-size: 14px;
+		color: #CCC;
+	}
+	/deep/ .van-button{
+		border-radius: 6px;
+		width: 100% !important;
+	}
+	.amount{
+		position: absolute;
+		bottom: 25px;
+		width:90%;
+		height: 50px;
+		font-size: 18px;
+		border-radius: 10px;
+	}
+	.van-field__label{
+		color:rgba(242, 46, 60, 1) !important;
+	}
+}
+
+</style>

+ 324 - 0
.history/pages/amount/index_20220609125621.vue

@@ -0,0 +1,324 @@
+<template>
+  <div class="mianBox">
+	<!-- <van-row class="balance">
+		<van-col span="24">余额:32.00元</van-col>
+	</van-row> -->
+	<van-row class="contentBox">
+		<van-row class="input_wrap">
+			<span>¥</span>
+			<input 
+				type="number"
+				placeholder="请输入充值金额( 元 )" 
+				class="input" 
+				@input="Input"
+				v-model="data.money"
+			/>
+		</van-row>
+	</van-row>
+    <van-row class="select_amount"  >
+        <van-col span="8" @tap="btn50"  :style="state1" data="50" >50</van-col>
+        <van-col style="margin-left:8%" span="8" @tap="btn100"  :style="state2" data="100">100</van-col>
+        <van-col style="margin-left:8%" span="8" @tap="btn150"  :style="state3" data="150">150</van-col>
+        <van-col span="8" @tap="btn200"  :style="state4" data="200">200</van-col>
+        <van-col style="margin-left:8%" span="8" @tap="btn250"  :style="state5" data="250">250</van-col>
+        <van-col style="margin-left:8%" span="8" @tap="btn300"  :style="state6" data="300">300</van-col>
+    </van-row>
+    <van-row class="pay_money" type="flex" justify="space-around">
+        <van-col span="12" class="left">到账金额</van-col>
+        <van-col span="12" class="right">¥{{data.money}}元</van-col>
+    </van-row>
+	
+    <!-- <van-row class="tip">
+		服务费 ¥0元<br>
+		费率 0%
+    </van-row> -->
+    <van-button class="amount"  color="#F22E3C" @tap="recharge">立即充值</van-button>
+	<van-dialog id="van-dialog" />
+	<van-toast id="van-toast" />
+   <!-- <van-loading size="24px" v-if = "loading" vertical style="z-index:999999;position:fixed;top:40%;left:0;right:0;" >加载中...</van-loading>
+    <van-overlay :show="loading"  style="z-index:100;position:fixed"/> -->
+  </div>
+</template>
+
+<script>
+import Toast from '../../wxcomponents/vant/weapp/dist/toast/toast';
+import Dialog from '../../wxcomponents/vant/weapp/dist/dialog/dialog'
+export default {
+  data() {
+    return {
+      show: false,
+      loading: false,
+      overlayShow: false,
+      env:null, //识别是否为扫描用户进入,以便直接进入支付跳转
+      state1:"color:#000;background: #ccc;",
+      state2:"color:#000;background: #ccc;",
+      state3:"color:#000;background: #ccc;",
+      state4:"color:#000;background: #ccc;",
+      state5:"color:#000;background: #ccc;",
+      state6:"color:#000;background: #ccc;",
+	  data:{
+		  money: "0",
+		  openid:null
+	  }
+    };
+  },
+  watch: {
+    money(val) {
+      // if (/^0[1-9]/.test(val)) {
+      //   this.data.money = val.substring(1);
+      // }
+    },
+  },
+  components: {
+    // [Field.name]: Field,
+    // [NumberKeyboard.name]: NumberKeyboard,
+    // [Dialog.name]: Dialog,
+    // [Toast.name]: Toast,
+  },
+  onLoad(options){
+	
+  },
+  created(){
+	let _this = this
+    uni.getStorage({
+    	key: 'openid',
+    	success: function (res) {
+    		_this.data.openid = res.data
+    	}
+    });
+  },
+	methods: {
+		recharge(){
+			if(this.data.money && this.data.money != 0 &&  this.data.money != "0.00"){
+				if(this.data.money.toString().indexOf(".")<1){
+					this.data.money = this.data.money + ".00"
+				}
+				if(this.data.openid){
+					//console.log(`"去支付页1"${JSON.stringify(this.data)}`)
+					uni.navigateTo({
+						url: `../order/index?params=${JSON.stringify(this.data)}`
+					});
+				}else{
+					//console.log(`"去支付页2"${JSON.stringify(this.data)}`)
+					uni.navigateTo({
+					    url: `../login/index?params=${JSON.stringify(this.data)}`
+					});
+				}
+			}else{
+				Toast('支付金额不能为空或0元');
+			}
+		},
+	Input(e){
+		let val = e.target.value.replace(/(^\s*)|(\s*$)/g, "")
+		if (!val) {
+			this.amount = '';
+			return
+		}
+		var reg = /[^\d.]/g
+	
+		// 只能是数字和小数点,不能是其他输入
+		val = val.replace(reg, "")
+		// // 保证第一位只能是数字,不能是点
+		val = val.replace(/^\./g, "");
+		// // 小数只能出现1位
+		val = val.replace(".", "$#$").replace(/\./g, "").replace("$#$", ".");
+		// // 小数点后面保留2位
+		val = val.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3');
+		if(val.indexOf("0") == 0){
+			if(val.length == 2){
+				val = "0."
+			}
+		}
+		this.$nextTick(() => {
+			this.data.money = val;
+		})
+		this.state1 = "color:#000;background: #ccc;",
+		this.state2 = "color:#000;background: #ccc;",
+		this.state3 = "color:#000;background: #ccc;",
+		this.state4 = "color:#000;background: #ccc;",
+		this.state5 = "color:#000;background: #ccc;",
+		this.state6 = "color:#000;background: #ccc;",
+		this.data.money = this.data.money + "";
+	},
+
+    jumpMode(){
+		//console.log(this.data.money)
+		if(this.data.money && this.data.money != 0 &&  this.data.money != "0.00"){
+			//this.pay(this.data.money, "A01", "3")
+		}else{
+			Toast('支付金额不能为空或0元');
+			Dialog.alert({
+				context: this,   // 增加this可用
+				selector:"#van-dialog",//选择器
+				title: '提示',
+				message: '充值金额不能为0元!'
+			}).then(() => {
+			  // on close
+			});
+		}
+    },
+    // recharge(){
+    //   this.jumpMode()
+    // },
+    btn50() {
+      this.state1 = "color:#fff;background:rgba(242, 46, 60, 1);",
+      this.state2 = "color:#000;background: #ccc;",
+      this.state3 = "color:#000;background: #ccc;",
+      this.state4 = "color:#000;background: #ccc;",
+      this.state5 = "color:#000;background: #ccc;",
+      this.state6 = "color:#000;background: #ccc;",
+      this.data.money = 50
+    },
+    btn100() {
+      this.state1 = "color:#000;background: #ccc;",
+      this.state2 = "color:#fff;background: rgba(242, 46, 60, 1);",
+      this.state3 = "color:#000;background: #ccc;",
+      this.state4 = "color:#000;background: #ccc;",
+      this.state5 = "color:#000;background: #ccc;",
+      this.state6 = "color:#000;background: #ccc;",
+      this.data.money = 100
+    },
+    btn150() {
+      this.state1 = "color:#000;background: #ccc;",
+      this.state2 = "color:#000;background: #ccc;",
+      this.state3 = "color:#fff;background: rgba(242, 46, 60, 1);",
+      this.state4 = "color:#000;background: #ccc;",
+      this.state5 = "color:#000;background: #ccc;",
+      this.state6 = "color:#000;background: #ccc;",
+      this.data.money = 150
+    },
+    btn200() {
+      this.state1 = "color:#000;background: #ccc;",
+      this.state2 = "color:#000;background: #ccc;",
+      this.state3 = "color:#000;background: #ccc;",
+      this.state4 = "color:#fff;background: rgba(242, 46, 60, 1);",
+      this.state5 = "color:#000;background: #ccc;",
+      this.state6 = "color:#000;background: #ccc;",
+      this.data.money = 200
+    },
+    btn250() {
+      this.state1 = "color:#000;background: #ccc;",
+      this.state2 = "color:#000;background: #ccc;",
+      this.state3 = "color:#000;background: #ccc;",
+      this.state4 = "color:#000;background: #ccc;",
+      this.state5 = "color:#fff;background: rgba(242, 46, 60, 1);",
+      this.state6 = "color:#000;background: #ccc;",
+      this.data.money = 250
+    },
+    btn300() {
+      this.state1 = "color:#000;background: #ccc;",
+      this.state2 = "color:#000;background: #ccc;",
+      this.state3 = "color:#000;background: #ccc;",
+      this.state4 = "color:#000;background: #ccc;",
+      this.state5 = "color:#000;background: #ccc;",
+      this.state6 = "color:#fff;background: rgba(242, 46, 60, 1);",
+      this.data.money = 300
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.mianBox {
+	width: 90%;
+	padding: 0 5% 0 5%;
+	height: 100%;
+	position: absolute;
+	// .balance{
+	// 	font-size: 16px;
+	// 	margin-top:20px;
+	// 	display: block;
+	// 	/deep/ .van-col{
+	// 		color:red;
+	// 		display: block;
+	// 	}
+	// }
+	.contentBox {
+		width: 90%;
+		position: absolute;
+		background-color: orange !important;
+		.input_wrap{
+			width:100%;
+			box-sizing: border-box;
+			border:1px solid #E6E6E6;
+			position: absolute;
+			margin-top:20px;
+			span{
+				font-size: 20px;
+				margin-left:10px;
+				color:rgba(242, 46, 60, 1);
+				display: inline-block;
+				vertical-align: middle;
+			}
+			input{
+				color:#000;
+				width:70%;
+				padding:8px 10px; 
+				display: inline-block;
+				vertical-align: middle;
+			}
+			::placeholder{
+				color:#000000;
+			}
+		}
+	}
+	.select_amount{
+		width:100%;
+		margin-top:60px;
+		display: block;
+		text-align: center;
+		/deep/ van-col{
+			padding:10px 0;
+			background-color: #ccc;
+			color:#000;
+			text-align: center;
+			font-size: 16px;
+			border-radius: 6px;
+			margin-top:20px;
+			float:left;
+			width:28%;
+		}
+		.van-col.active{
+			background: rgba(242, 46, 60, 1);
+			color:#fff;
+		}
+		/deep/ .van-col{
+			text-align: center !important;
+			width:100%;
+			display: block;
+			
+		}
+	}
+	.pay_money{
+	    font-size: 16px;
+	    margin:15px 0;
+		display: block;
+	    .left{
+	      text-align: left;
+	    }
+	    .right{
+	      text-align: right;
+	      color: rgba(242, 46, 60, 1);
+	    }
+	}
+	.tip{
+		font-size: 14px;
+		color: #CCC;
+	}
+	/deep/ .van-button{
+		border-radius: 6px;
+		width: 100% !important;
+	}
+	.amount{
+		position: absolute;
+		bottom: 25px;
+		width:90%;
+		height: 50px;
+		font-size: 18px;
+		border-radius: 10px;
+	}
+	.van-field__label{
+		color:rgba(242, 46, 60, 1) !important;
+	}
+}
+
+</style>

+ 324 - 0
.history/pages/amount/index_20220609125625.vue

@@ -0,0 +1,324 @@
+<template>
+  <div class="mianBox">
+	<!-- <van-row class="balance">
+		<van-col span="24">余额:32.00元</van-col>
+	</van-row> -->
+	<van-row class="contentBox">
+		<van-row class="input_wrap">
+			<span>¥</span>
+			<input 
+				type="number"
+				placeholder="请输入充值金额( 元 )" 
+				class="input" 
+				@input="Input"
+				v-model="data.money"
+			/>
+		</van-row>
+	</van-row>
+    <van-row class="select_amount"  >
+        <van-col span="8" @tap="btn50"  :style="state1" data="50" >50</van-col>
+        <van-col style="margin-left:8%" span="8" @tap="btn100"  :style="state2" data="100">100</van-col>
+        <van-col style="margin-left:8%" span="8" @tap="btn150"  :style="state3" data="150">150</van-col>
+        <van-col span="8" @tap="btn200"  :style="state4" data="200">200</van-col>
+        <van-col style="margin-left:8%" span="8" @tap="btn250"  :style="state5" data="250">250</van-col>
+        <van-col style="margin-left:8%" span="8" @tap="btn300"  :style="state6" data="300">300</van-col>
+    </van-row>
+    <van-row class="pay_money" type="flex" justify="space-around">
+        <van-col span="12" class="left">到账金额</van-col>
+        <van-col span="12" class="right">¥{{data.money}}元</van-col>
+    </van-row>
+	
+    <!-- <van-row class="tip">
+		服务费 ¥0元<br>
+		费率 0%
+    </van-row> -->
+    <van-button class="amount"  color="#F22E3C" @tap="recharge">立即充值</van-button>
+	<van-dialog id="van-dialog" />
+	<van-toast id="van-toast" />
+   <!-- <van-loading size="24px" v-if = "loading" vertical style="z-index:999999;position:fixed;top:40%;left:0;right:0;" >加载中...</van-loading>
+    <van-overlay :show="loading"  style="z-index:100;position:fixed"/> -->
+  </div>
+</template>
+
+<script>
+import Toast from '../../wxcomponents/vant/weapp/dist/toast/toast';
+import Dialog from '../../wxcomponents/vant/weapp/dist/dialog/dialog'
+export default {
+  data() {
+    return {
+      show: false,
+      loading: false,
+      overlayShow: false,
+      env:null, //识别是否为扫描用户进入,以便直接进入支付跳转
+      state1:"color:#000;background: #ccc;",
+      state2:"color:#000;background: #ccc;",
+      state3:"color:#000;background: #ccc;",
+      state4:"color:#000;background: #ccc;",
+      state5:"color:#000;background: #ccc;",
+      state6:"color:#000;background: #ccc;",
+	  data:{
+		  money: "0",
+		  openid:null
+	  }
+    };
+  },
+  watch: {
+    money(val) {
+      // if (/^0[1-9]/.test(val)) {
+      //   this.data.money = val.substring(1);
+      // }
+    },
+  },
+  components: {
+    // [Field.name]: Field,
+    // [NumberKeyboard.name]: NumberKeyboard,
+    // [Dialog.name]: Dialog,
+    // [Toast.name]: Toast,
+  },
+  onLoad(options){
+	
+  },
+  created(){
+	let _this = this
+    uni.getStorage({
+    	key: 'openid',
+    	success: function (res) {
+    		_this.data.openid = res.data
+    	}
+    });
+  },
+	methods: {
+		recharge(){
+			if(this.data.money && this.data.money != 0 &&  this.data.money != "0.00"){
+				if(this.data.money.toString().indexOf(".")<1){
+					this.data.money = this.data.money + ".00"
+				}
+				if(this.data.openid){
+					//console.log(`"去支付页1"${JSON.stringify(this.data)}`)
+					uni.navigateTo({
+						url: `../order/index?params=${JSON.stringify(this.data)}`
+					});
+				}else{
+					//console.log(`"去支付页2"${JSON.stringify(this.data)}`)
+					uni.navigateTo({
+					    url: `../login/index?params=${JSON.stringify(this.data)}`
+					});
+				}
+			}else{
+				Toast('支付金额不能为空或0元');
+			}
+		},
+	Input(e){
+		let val = e.target.value.replace(/(^\s*)|(\s*$)/g, "")
+		if (!val) {
+			this.amount = '';
+			return
+		}
+		var reg = /[^\d.]/g
+	
+		// 只能是数字和小数点,不能是其他输入
+		val = val.replace(reg, "")
+		// // 保证第一位只能是数字,不能是点
+		val = val.replace(/^\./g, "");
+		// // 小数只能出现1位
+		val = val.replace(".", "$#$").replace(/\./g, "").replace("$#$", ".");
+		// // 小数点后面保留2位
+		val = val.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3');
+		if(val.indexOf("0") == 0){
+			if(val.length == 2){
+				val = "0."
+			}
+		}
+		this.$nextTick(() => {
+			this.data.money = val;
+		})
+		this.state1 = "color:#000;background: #ccc;",
+		this.state2 = "color:#000;background: #ccc;",
+		this.state3 = "color:#000;background: #ccc;",
+		this.state4 = "color:#000;background: #ccc;",
+		this.state5 = "color:#000;background: #ccc;",
+		this.state6 = "color:#000;background: #ccc;",
+		this.data.money = this.data.money + "";
+	},
+
+    jumpMode(){
+		//console.log(this.data.money)
+		if(this.data.money && this.data.money != 0 &&  this.data.money != "0.00"){
+			//this.pay(this.data.money, "A01", "3")
+		}else{
+			Toast('支付金额不能为空或0元');
+			Dialog.alert({
+				context: this,   // 增加this可用
+				selector:"#van-dialog",//选择器
+				title: '提示',
+				message: '充值金额不能为0元!'
+			}).then(() => {
+			  // on close
+			});
+		}
+    },
+    // recharge(){
+    //   this.jumpMode()
+    // },
+    btn50() {
+      this.state1 = "color:#fff;background:rgba(242, 46, 60, 1);",
+      this.state2 = "color:#000;background: #ccc;",
+      this.state3 = "color:#000;background: #ccc;",
+      this.state4 = "color:#000;background: #ccc;",
+      this.state5 = "color:#000;background: #ccc;",
+      this.state6 = "color:#000;background: #ccc;",
+      this.data.money = 50
+    },
+    btn100() {
+      this.state1 = "color:#000;background: #ccc;",
+      this.state2 = "color:#fff;background: rgba(242, 46, 60, 1);",
+      this.state3 = "color:#000;background: #ccc;",
+      this.state4 = "color:#000;background: #ccc;",
+      this.state5 = "color:#000;background: #ccc;",
+      this.state6 = "color:#000;background: #ccc;",
+      this.data.money = 100
+    },
+    btn150() {
+      this.state1 = "color:#000;background: #ccc;",
+      this.state2 = "color:#000;background: #ccc;",
+      this.state3 = "color:#fff;background: rgba(242, 46, 60, 1);",
+      this.state4 = "color:#000;background: #ccc;",
+      this.state5 = "color:#000;background: #ccc;",
+      this.state6 = "color:#000;background: #ccc;",
+      this.data.money = 150
+    },
+    btn200() {
+      this.state1 = "color:#000;background: #ccc;",
+      this.state2 = "color:#000;background: #ccc;",
+      this.state3 = "color:#000;background: #ccc;",
+      this.state4 = "color:#fff;background: rgba(242, 46, 60, 1);",
+      this.state5 = "color:#000;background: #ccc;",
+      this.state6 = "color:#000;background: #ccc;",
+      this.data.money = 200
+    },
+    btn250() {
+      this.state1 = "color:#000;background: #ccc;",
+      this.state2 = "color:#000;background: #ccc;",
+      this.state3 = "color:#000;background: #ccc;",
+      this.state4 = "color:#000;background: #ccc;",
+      this.state5 = "color:#fff;background: rgba(242, 46, 60, 1);",
+      this.state6 = "color:#000;background: #ccc;",
+      this.data.money = 250
+    },
+    btn300() {
+      this.state1 = "color:#000;background: #ccc;",
+      this.state2 = "color:#000;background: #ccc;",
+      this.state3 = "color:#000;background: #ccc;",
+      this.state4 = "color:#000;background: #ccc;",
+      this.state5 = "color:#000;background: #ccc;",
+      this.state6 = "color:#fff;background: rgba(242, 46, 60, 1);",
+      this.data.money = 300
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.mianBox {
+	width: 90%;
+	padding: 0 5% 0 5%;
+	height: 100%;
+	position: absolute;
+	// .balance{
+	// 	font-size: 16px;
+	// 	margin-top:20px;
+	// 	display: block;
+	// 	/deep/ .van-col{
+	// 		color:red;
+	// 		display: block;
+	// 	}
+	// }
+	.contentBox {
+		width: 90%;
+		position: absolute;
+		background-color: orange !important;
+		.input_wrap{
+			width:100%;
+			box-sizing: border-box;
+			border:1px solid #E6E6E6;
+			position: absolute;
+			margin-top:20px;
+			span{
+				font-size: 20px;
+				margin-left:10px;
+				color:rgba(242, 46, 60, 1);
+				display: inline-block;
+				vertical-align: middle;
+			}
+			input{
+				color:#000;
+				width:70%;
+				padding:8px 10px; 
+				display: inline-block;
+				vertical-align: middle;
+			}
+			::placeholder{
+				color:#000000;
+			}
+		}
+	}
+	.select_amount{
+		width:100%;
+		margin-top:60px;
+		display: block;
+		text-align: center;
+		/deep/ van-col{
+			padding:10px 0;
+			background-color: #ccc;
+			color:#000;
+			text-align: center;
+			font-size: 16px;
+			border-radius: 6px;
+			margin-top:20px;
+			float:left;
+			width:28%;
+		}
+		.van-col.active{
+			background: rgba(242, 46, 60, 1);
+			color:#fff;
+		}
+		/deep/ .van-col{
+			text-align: center !important;
+			width:100%;
+			display: block;
+			
+		}
+	}
+	.pay_money{
+	    font-size: 16px;
+	    margin:15px 0;
+		display: block;
+	    .left{
+	      text-align: left;
+	    }
+	    .right{
+	      text-align: right;
+	      color: rgba(242, 46, 60, 1);
+	    }
+	}
+	.tip{
+		font-size: 14px;
+		color: #CCC;
+	}
+	/deep/ .van-button{
+		border-radius: 6px;
+		width: 100% !important;
+	}
+	.amount{
+		position: absolute;
+		bottom: 25px;
+		width:90%;
+		height: 50px;
+		font-size: 18px;
+		border-radius: 10px;
+	}
+	.van-field__label{
+		color:rgba(242, 46, 60, 1) !important;
+	}
+}
+
+</style>

+ 324 - 0
.history/pages/amount/index_20220609130109.vue

@@ -0,0 +1,324 @@
+<template>
+  <div class="mianBox">
+	<!-- <van-row class="balance">
+		<van-col span="24">余额:32.00元</van-col>
+	</van-row> -->
+	<van-row class="contentBox">
+		<van-row class="input_wrap">
+			<span>¥</span>
+			<input 
+				type="number"
+				placeholder="请输入充值金额( 元 )" 
+				class="input" 
+				@input="Input"
+				v-model="data.money"
+			/>
+		</van-row>
+	</van-row>
+    <van-row class="select_amount"  >
+        <van-col span="8" @tap="btn50"  :style="state1" data="50" >50</van-col>
+        <van-col style="margin-left:8%" span="8" @tap="btn100"  :style="state2" data="100">100</van-col>
+        <van-col style="margin-left:8%" span="8" @tap="btn150"  :style="state3" data="150">150</van-col>
+        <van-col span="8" @tap="btn200"  :style="state4" data="200">200</van-col>
+        <van-col style="margin-left:8%" span="8" @tap="btn250"  :style="state5" data="250">250</van-col>
+        <van-col style="margin-left:8%" span="8" @tap="btn300"  :style="state6" data="300">300</van-col>
+    </van-row>
+    <van-row class="pay_money" type="flex" justify="space-around">
+        <van-col span="12" class="left">到账金额</van-col>
+        <van-col span="12" class="right">¥{{data.money}}元</van-col>
+    </van-row>
+	
+    <!-- <van-row class="tip">
+		服务费 ¥0元<br>
+		费率 0%
+    </van-row> -->
+    <van-button class="amount"  color="#F22E3C" @tap="recharge">立即充值</van-button>
+	<van-dialog id="van-dialog" />
+	<van-toast id="van-toast" />
+   <!-- <van-loading size="24px" v-if = "loading" vertical style="z-index:999999;position:fixed;top:40%;left:0;right:0;" >加载中...</van-loading>
+    <van-overlay :show="loading"  style="z-index:100;position:fixed"/> -->
+  </div>
+</template>
+
+<script>
+import Toast from '../../wxcomponents/vant/weapp/dist/toast/toast';
+import Dialog from '../../wxcomponents/vant/weapp/dist/dialog/dialog'
+export default {
+  data() {
+    return {
+      show: false,
+      loading: false,
+      overlayShow: false,
+      env:null, //识别是否为扫描用户进入,以便直接进入支付跳转
+      state1:"color:#000;background: #ccc;",
+      state2:"color:#000;background: #ccc;",
+      state3:"color:#000;background: #ccc;",
+      state4:"color:#000;background: #ccc;",
+      state5:"color:#000;background: #ccc;",
+      state6:"color:#000;background: #ccc;",
+	  data:{
+		  money: "0",
+		  openid:null
+	  }
+    };
+  },
+  watch: {
+    money(val) {
+      // if (/^0[1-9]/.test(val)) {
+      //   this.data.money = val.substring(1);
+      // }
+    },
+  },
+  components: {
+    // [Field.name]: Field,
+    // [NumberKeyboard.name]: NumberKeyboard,
+    // [Dialog.name]: Dialog,
+    // [Toast.name]: Toast,
+  },
+  onLoad(options){
+	
+  },
+  created(){
+	let _this = this
+    uni.getStorage({
+    	key: 'openid',
+    	success: function (res) {
+    		_this.data.openid = res.data
+    	}
+    });
+  },
+	methods: {
+		recharge(){
+			if(this.data.money && this.data.money != 0 &&  this.data.money != "0.00"){
+				if(this.data.money.toString().indexOf(".")<1){
+					this.data.money = this.data.money + ".00"
+				}
+				if(this.data.openid){
+					//console.log(`"去支付页1"${JSON.stringify(this.data)}`)
+					uni.navigateTo({
+						url: `../order/index?params=${JSON.stringify(this.data)}`
+					});
+				}else{
+					//console.log(`"去支付页2"${JSON.stringify(this.data)}`)
+					uni.navigateTo({
+					    url: `../login/index?params=${JSON.stringify(this.data)}`
+					});
+				}
+			}else{
+				Toast('支付金额不能为空或0元');
+			}
+		},
+	Input(e){
+		let val = e.target.value.replace(/(^\s*)|(\s*$)/g, "")
+		if (!val) {
+			this.amount = '';
+			return
+		}
+		var reg = /[^\d.]/g
+	
+		// 只能是数字和小数点,不能是其他输入
+		val = val.replace(reg, "")
+		// // 保证第一位只能是数字,不能是点
+		val = val.replace(/^\./g, "");
+		// // 小数只能出现1位
+		val = val.replace(".", "$#$").replace(/\./g, "").replace("$#$", ".");
+		// // 小数点后面保留2位
+		val = val.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3');
+		if(val.indexOf("0") == 0){
+			if(val.length == 2){
+				val = "0."
+			}
+		}
+		this.$nextTick(() => {
+			this.data.money = val;
+		})
+		this.state1 = "color:#000;background: #ccc;",
+		this.state2 = "color:#000;background: #ccc;",
+		this.state3 = "color:#000;background: #ccc;",
+		this.state4 = "color:#000;background: #ccc;",
+		this.state5 = "color:#000;background: #ccc;",
+		this.state6 = "color:#000;background: #ccc;",
+		this.data.money = this.data.money + "";
+	},
+
+    jumpMode(){
+		//console.log(this.data.money)
+		if(this.data.money && this.data.money != 0 &&  this.data.money != "0.00"){
+			//this.pay(this.data.money, "A01", "3")
+		}else{
+			Toast('支付金额不能为空或0元');
+			Dialog.alert({
+				context: this,   // 增加this可用
+				selector:"#van-dialog",//选择器
+				title: '提示',
+				message: '充值金额不能为0元!'
+			}).then(() => {
+			  // on close
+			});
+		}
+    },
+    // recharge(){
+    //   this.jumpMode()
+    // },
+    btn50() {
+      this.state1 = "color:#fff;background:rgba(242, 46, 60, 1);",
+      this.state2 = "color:#000;background: #ccc;",
+      this.state3 = "color:#000;background: #ccc;",
+      this.state4 = "color:#000;background: #ccc;",
+      this.state5 = "color:#000;background: #ccc;",
+      this.state6 = "color:#000;background: #ccc;",
+      this.data.money = 50
+    },
+    btn100() {
+      this.state1 = "color:#000;background: #ccc;",
+      this.state2 = "color:#fff;background: rgba(242, 46, 60, 1);",
+      this.state3 = "color:#000;background: #ccc;",
+      this.state4 = "color:#000;background: #ccc;",
+      this.state5 = "color:#000;background: #ccc;",
+      this.state6 = "color:#000;background: #ccc;",
+      this.data.money = 100
+    },
+    btn150() {
+      this.state1 = "color:#000;background: #ccc;",
+      this.state2 = "color:#000;background: #ccc;",
+      this.state3 = "color:#fff;background: rgba(242, 46, 60, 1);",
+      this.state4 = "color:#000;background: #ccc;",
+      this.state5 = "color:#000;background: #ccc;",
+      this.state6 = "color:#000;background: #ccc;",
+      this.data.money = 150
+    },
+    btn200() {
+      this.state1 = "color:#000;background: #ccc;",
+      this.state2 = "color:#000;background: #ccc;",
+      this.state3 = "color:#000;background: #ccc;",
+      this.state4 = "color:#fff;background: rgba(242, 46, 60, 1);",
+      this.state5 = "color:#000;background: #ccc;",
+      this.state6 = "color:#000;background: #ccc;",
+      this.data.money = 200
+    },
+    btn250() {
+      this.state1 = "color:#000;background: #ccc;",
+      this.state2 = "color:#000;background: #ccc;",
+      this.state3 = "color:#000;background: #ccc;",
+      this.state4 = "color:#000;background: #ccc;",
+      this.state5 = "color:#fff;background: rgba(242, 46, 60, 1);",
+      this.state6 = "color:#000;background: #ccc;",
+      this.data.money = 250
+    },
+    btn300() {
+      this.state1 = "color:#000;background: #ccc;",
+      this.state2 = "color:#000;background: #ccc;",
+      this.state3 = "color:#000;background: #ccc;",
+      this.state4 = "color:#000;background: #ccc;",
+      this.state5 = "color:#000;background: #ccc;",
+      this.state6 = "color:#fff;background: rgba(242, 46, 60, 1);",
+      this.data.money = 300
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.mianBox {
+	width: 90%;
+	padding: 0 5% 0 5%;
+	height: 100%;
+	position: absolute;
+	// .balance{
+	// 	font-size: 16px;
+	// 	margin-top:20px;
+	// 	display: block;
+	// 	/deep/ .van-col{
+	// 		color:red;
+	// 		display: block;
+	// 	}
+	// }
+	.contentBox {
+		width: 90%;
+		position: absolute;
+		background-color: orange !important;
+		.input_wrap{
+			width:100%;
+			box-sizing: border-box;
+			border:1px solid #E6E6E6;
+			position: absolute;
+			margin-top:20px;
+			span{
+				font-size: 20px;
+				margin-left:10px;
+				color:rgba(242, 46, 60, 1);
+				display: inline-block;
+				vertical-align: middle;
+			}
+			input{
+				color:#000;
+				width:70%;
+				padding:8px 10px; 
+				display: inline-block;
+				vertical-align: middle;
+			}
+			::placeholder{
+				color:#000000;
+			}
+		}
+	}
+	.select_amount{
+		width:100%;
+		margin-top:60px;
+		display: block;
+		text-align: center;
+		/deep/ van-col{
+			padding:10px 0;
+			background-color: #ccc;
+			color:#000;
+			text-align: center;
+			font-size: 16px;
+			border-radius: 6px;
+			margin-top:20px;
+			float:left;
+			width:28%;
+		}
+		.van-col.active{
+			background: rgba(242, 46, 60, 1);
+			color:#fff;
+		}
+		/deep/ .van-col{
+			text-align: center !important;
+			width:100%;
+			display: block;
+			
+		}
+	}
+	.pay_money{
+	    font-size: 16px;
+	    margin:15px 0;
+		display: block;
+	    .left{
+	      text-align: left;
+	    }
+	    .right{
+	      text-align: right;
+	      color: rgba(242, 46, 60, 1);
+	    }
+	}
+	.tip{
+		font-size: 14px;
+		color: #CCC;
+	}
+	/deep/ .van-button{
+		border-radius: 6px;
+		width: 100% !important;
+	}
+	.amount{
+		position: absolute;
+		bottom: 25px;
+		width:90%;
+		height: 50px;
+		font-size: 18px;
+		border-radius: 10px;
+	}
+	.van-field__label{
+		color:rgba(242, 46, 60, 1) !important;
+	}
+}
+
+</style>

+ 120 - 0
.history/pages/index/index_20220609123928.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_20220609123933.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>
+

+ 273 - 0
.history/pages/order/index_20220609100202.vue

@@ -0,0 +1,273 @@
+<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"   bindlaunchapp="launchAppSuccess" binderror="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: {
+			launchAppError(e) {
+				Toast(e.detail.errMsg)
+			},
+			// 关闭小程序
+			launchAppSuccess(){
+				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>
+
+

+ 273 - 0
.history/pages/order/index_20220609100227.vue

@@ -0,0 +1,273 @@
+<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"   bindlaunchapp="launchAppSuccess" binderror="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: {
+			launchAppError(e) {
+				Toast(e.detail.errMsg)
+			},
+			// 关闭小程序
+			launchAppSuccess(){
+				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>
+
+

+ 273 - 0
.history/pages/order/index_20220609100238.vue

@@ -0,0 +1,273 @@
+<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"   bindlaunchapp="launchAppSuccess" binderror="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: {
+			launchAppError(e) {
+				Toast(e.detail.errMsg)
+			},
+			// 关闭小程序
+			launchAppSuccess(){
+				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>
+
+

+ 273 - 0
.history/pages/order/index_20220609102336.vue

@@ -0,0 +1,273 @@
+<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"   bindlaunchapp="launchAppSuccess" binderror="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: {
+			launchAppError(e) {
+				Toast(e.detail.errMsg)
+			},
+			// 关闭小程序
+			launchAppSuccess(){
+				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>
+
+

+ 273 - 0
.history/pages/order/index_20220609102345.vue

@@ -0,0 +1,273 @@
+<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"   bindlaunchapp="launchAppSuccess" binderror="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: {
+			launchAppError(e) {
+				Toast(e.detail.errMsg)
+			},
+			// 关闭小程序
+			launchAppSuccess(){
+				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>
+
+

+ 273 - 0
.history/pages/order/index_20220609102824.vue

@@ -0,0 +1,273 @@
+<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"   bindlaunchapp="launchAppSuccess" binderror="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: {
+			launchAppError(e) {
+				Toast(e.detail.errMsg)
+			},
+			// 关闭小程序
+			launchAppSuccess(){
+				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>
+
+

+ 273 - 0
.history/pages/order/index_20220609102825.vue

@@ -0,0 +1,273 @@
+<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"   bindlaunchapp="launchAppSuccess" binderror="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: {
+			launchAppError(e) {
+				Toast(e.detail.errMsg)
+			},
+			// 关闭小程序
+			launchAppSuccess(){
+				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>
+
+

+ 273 - 0
.history/pages/order/index_20220609102826.vue

@@ -0,0 +1,273 @@
+<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"   bindlaunchapp="launchAppSuccess" binderror="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: {
+			launchAppError(e) {
+				Toast(e.detail.errMsg)
+			},
+			// 关闭小程序
+			launchAppSuccess(){
+				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>
+
+

+ 273 - 0
.history/pages/order/index_20220609102827.vue

@@ -0,0 +1,273 @@
+<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"   bindlaunchapp="launchAppSuccess" binderror="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: {
+			launchAppError(e) {
+				Toast(e.detail.errMsg)
+			},
+			// 关闭小程序
+			launchAppSuccess(){
+				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>
+
+

+ 273 - 0
.history/pages/order/index_20220609102834.vue

@@ -0,0 +1,273 @@
+<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"   bindlaunchapp="launchAppSuccess" binderror="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: {
+			launchAppError(e) {
+				Toast(e.detail.errMsg)
+			},
+			// 关闭小程序
+			launchAppSuccess(){
+				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>
+
+

+ 273 - 0
.history/pages/order/index_20220609102835.vue

@@ -0,0 +1,273 @@
+<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"   bindlaunchapp="launchAppSuccess" binderror="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: {
+			launchAppError(e) {
+				Toast(e.detail.errMsg)
+			},
+			// 关闭小程序
+			launchAppSuccess(){
+				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>
+
+

+ 273 - 0
.history/pages/order/index_20220609102843.vue

@@ -0,0 +1,273 @@
+<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"   bindlaunchapp="launchAppSuccess" binderror="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: {
+			launchAppError(e) {
+				Toast(e.detail.errMsg)
+			},
+			// 关闭小程序
+			launchAppSuccess(){
+				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>
+
+

+ 274 - 0
.history/pages/order/index_20220609123800.vue

@@ -0,0 +1,274 @@
+<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"   bindlaunchapp="launchAppSuccess" binderror="launchAppError" v-if="data.userId">返回APP</button>
+			<button class="pay" open-type="launchApp" app-parameter="appData"   bindlaunchapp="launchAppSuccess" binderror="launchAppError" v-if="!data.userId">返回首页</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: {
+			launchAppError(e) {
+				Toast(e.detail.errMsg)
+			},
+			// 关闭小程序
+			launchAppSuccess(){
+				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>
+
+

+ 277 - 0
.history/pages/order/index_20220609123847.vue

@@ -0,0 +1,277 @@
+<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"   bindlaunchapp="launchAppSuccess" binderror="launchAppError" v-if="data.userId">返回APP</button>
+			<button class="pay" @click="fanhui" v-if="!data.userId">返回首页</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: {
+			fanhui(){
+
+			},
+			launchAppError(e) {
+				Toast(e.detail.errMsg)
+			},
+			// 关闭小程序
+			launchAppSuccess(){
+				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>
+
+

+ 279 - 0
.history/pages/order/index_20220609123920.vue

@@ -0,0 +1,279 @@
+<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"   bindlaunchapp="launchAppSuccess" binderror="launchAppError" v-if="data.userId">返回APP</button>
+			<button class="pay" @click="fanhui" v-if="!data.userId">返回首页</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: {
+			fanhui(){
+				uni.navigateTo({
+					url: `../index/index`
+				});
+			},
+			launchAppError(e) {
+				Toast(e.detail.errMsg)
+			},
+			// 关闭小程序
+			launchAppSuccess(){
+				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>
+
+

+ 279 - 0
.history/pages/order/index_20220609124548.vue

@@ -0,0 +1,279 @@
+<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"   bindlaunchapp="launchAppSuccess" binderror="launchAppError" v-if="data.userId">返回APP</button>
+			<button class="pay" @click="fanhui" v-if="!data.userId">返回首页</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: {
+			fanhui(){
+				uni.navigateTo({
+					url: `../index/index`
+				});
+			},
+			launchAppError(e) {
+				Toast(e.detail.errMsg)
+			},
+			// 关闭小程序
+			launchAppSuccess(){
+				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;
+			padding:16px 0;
+		}
+		.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>
+
+

+ 279 - 0
.history/pages/order/index_20220609124619.vue

@@ -0,0 +1,279 @@
+<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"   bindlaunchapp="launchAppSuccess" binderror="launchAppError" v-if="data.userId">返回APP</button>
+			<button class="pay" @click="fanhui" v-if="!data.userId">返回首页</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: {
+			fanhui(){
+				uni.navigateTo({
+					url: `../index/index`
+				});
+			},
+			launchAppError(e) {
+				Toast(e.detail.errMsg)
+			},
+			// 关闭小程序
+			launchAppSuccess(){
+				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:40px;
+		}
+		.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>
+
+

+ 278 - 0
.history/pages/order/index_20220609124651.vue

@@ -0,0 +1,278 @@
+<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"   bindlaunchapp="launchAppSuccess" binderror="launchAppError" v-if="data.userId">返回APP</button>
+			<button class="pay" @click="fanhui" v-if="!data.userId">返回首页</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: {
+			fanhui(){
+				uni.navigateTo({
+					url: `../index/index`
+				});
+			},
+			launchAppError(e) {
+				Toast(e.detail.errMsg)
+			},
+			// 关闭小程序
+			launchAppSuccess(){
+				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;
+			letter-spacing: 2px;
+			font-size: 18px;
+			height:40px;
+		}
+		.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>
+
+

+ 278 - 0
.history/pages/order/index_20220609124731.vue

@@ -0,0 +1,278 @@
+<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"   bindlaunchapp="launchAppSuccess" binderror="launchAppError" v-if="data.userId">返回APP</button>
+			<button class="pay" @click="fanhui" v-if="!data.userId">返回首页</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: {
+			fanhui(){
+				uni.navigateTo({
+					url: `../index/index`
+				});
+			},
+			launchAppError(e) {
+				Toast(e.detail.errMsg)
+			},
+			// 关闭小程序
+			launchAppSuccess(){
+				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;
+			letter-spacing: 2px;
+			font-size: 18px;
+			height:40px;
+		}
+		.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: 40px;
+				font-size: 18px;
+				border-radius: 10px;
+				margin-top:40px;
+			}
+		}
+		
+    }
+}
+.pay{
+	background:#F22E3C;
+	color:#fff;
+}
+</style>
+
+

+ 277 - 0
.history/pages/order/index_20220609124745.vue

@@ -0,0 +1,277 @@
+<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"   bindlaunchapp="launchAppSuccess" binderror="launchAppError" v-if="data.userId">返回APP</button>
+			<button class="pay" @click="fanhui" v-if="!data.userId">返回首页</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: {
+			fanhui(){
+				uni.navigateTo({
+					url: `../index/index`
+				});
+			},
+			launchAppError(e) {
+				Toast(e.detail.errMsg)
+			},
+			// 关闭小程序
+			launchAppSuccess(){
+				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;
+			letter-spacing: 2px;
+			font-size: 18px;
+			height:40px;
+		}
+		.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: 40px;
+				font-size: 18px;
+				border-radius: 10px;
+			}
+		}
+		
+    }
+}
+.pay{
+	background:#F22E3C;
+	color:#fff;
+}
+</style>
+
+

+ 277 - 0
.history/pages/order/index_20220609124814.vue

@@ -0,0 +1,277 @@
+<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"   bindlaunchapp="launchAppSuccess" binderror="launchAppError" v-if="data.userId">返回APP</button>
+			<button class="pay" @click="fanhui" v-if="!data.userId">返回首页</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: {
+			fanhui(){
+				uni.navigateTo({
+					url: `../index/index`
+				});
+			},
+			launchAppError(e) {
+				Toast(e.detail.errMsg)
+			},
+			// 关闭小程序
+			launchAppSuccess(){
+				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;
+			letter-spacing: 2px;
+			font-size: 18px;
+			height:40px;
+		}
+		.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: 40px;
+				font-size: 18px;
+				margin-top:30px;
+			}
+		}
+		
+    }
+}
+.pay{
+	background:#F22E3C;
+	color:#fff;
+}
+</style>
+
+

+ 278 - 0
.history/pages/order/index_20220609124840.vue

@@ -0,0 +1,278 @@
+<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"   bindlaunchapp="launchAppSuccess" binderror="launchAppError" v-if="data.userId">返回APP</button>
+			<button class="pay" @click="fanhui" v-if="!data.userId">返回首页</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: {
+			fanhui(){
+				uni.navigateTo({
+					url: `../index/index`
+				});
+			},
+			launchAppError(e) {
+				Toast(e.detail.errMsg)
+			},
+			// 关闭小程序
+			launchAppSuccess(){
+				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;
+			letter-spacing: 2px;
+			font-size: 18px;
+			height:40px;
+		}
+		.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: 40px;
+				font-size: 18px;
+				margin-top:30px;
+				border-radius: 6px;
+			}
+		}
+		
+    }
+}
+.pay{
+	background:#F22E3C;
+	color:#fff;
+}
+</style>
+
+

+ 278 - 0
.history/pages/order/index_20220609125010.vue

@@ -0,0 +1,278 @@
+<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"   bindlaunchapp="launchAppSuccess" binderror="launchAppError" v-if="data.userId">返回APP</button>
+			<button class="pay" @click="fanhui" v-if="!data.userId">返回首页</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: {
+			fanhui(){
+				uni.navigateTo({
+					url: `../index/index`
+				});
+			},
+			launchAppError(e) {
+				Toast(e.detail.errMsg)
+			},
+			// 关闭小程序
+			launchAppSuccess(){
+				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;
+			letter-spacing: 2px;
+			font-size: 18px;
+			height:40px;
+		}
+		.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: 40px;
+				font-size: 18px;
+				margin-top:30px;
+				border-radius: 6px;
+			}
+		}
+		
+    }
+}
+.pay{
+	background:#F22E3C;
+	color:#fff;
+}
+</style>
+
+

+ 279 - 0
.history/pages/order/index_20220609125107.vue

@@ -0,0 +1,279 @@
+<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"   bindlaunchapp="launchAppSuccess" binderror="launchAppError" v-if="data.userId">返回APP</button>
+			<button class="pay" @click="fanhui" v-if="!data.userId">返回首页</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: {
+			fanhui(){
+				uni.navigateTo({
+					url: `../index/index`
+				});
+			},
+			launchAppError(e) {
+				Toast(e.detail.errMsg)
+			},
+			// 关闭小程序
+			launchAppSuccess(){
+				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>
+
+

+ 280 - 0
.history/pages/order/index_20220609125228.vue

@@ -0,0 +1,280 @@
+<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"   bindlaunchapp="launchAppSuccess" binderror="launchAppError" v-if="data.userId">返回APP</button>
+			<button class="pay" @click="fanhui" v-if="!data.userId">返回首页</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: {
+			fanhui(){
+				uni.navigateTo({
+					url: `../index/index`
+				});
+			},
+			launchAppError(e) {
+				Toast(e.detail.errMsg)
+			},
+			// 关闭小程序
+			launchAppSuccess(){
+				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;
+				line-height: 50px;
+				font-size: 18px;
+				border-radius: 10px;
+				margin-top:40px;
+			}
+		}
+		
+    }
+}
+.pay{
+	background:#F22E3C;
+	color:#fff;
+}
+</style>
+
+

+ 170 - 0
.history/pages/over/index_20220609102312.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="appData"  bindlaunchapp="launchAppSuccess" binderror="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:1,
+					errStr:null,
+					extMsg:"已支付",
+					extraData:"已支付",
+					openId:null,
+					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)
+			},
+			// 关闭小程序
+			launchAppSuccess(){
+				wx.exitMiniProgram({success: (res) => {}})
+			},
+			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_20220609102322.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"  bindlaunchapp="launchAppSuccess" binderror="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:1,
+					errStr:null,
+					extMsg:"已支付",
+					extraData:"已支付",
+					openId:null,
+					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)
+			},
+			// 关闭小程序
+			launchAppSuccess(){
+				wx.exitMiniProgram({success: (res) => {}})
+			},
+			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>
+
+

+ 1 - 1
pages/index/index.vue

@@ -25,7 +25,7 @@
 			// 对接app测试代码
 					// let userId ='0001T110000000002HBL'
 					// var  a = {
-					// 	money:1,
+					// 	money:0.1,
 					// 	channelId:null,
 					// 	userId:'0001T110000000002HBL',
 					// 	scene:3,

+ 10 - 3
pages/order/index.vue

@@ -10,6 +10,7 @@
 		<div class="pay_wrap">
 			<van-button class="pay"  color="#F22E3C" @tap="pay">支付</van-button>
 			<button class="pay" open-type="launchApp" app-parameter="appData"   bindlaunchapp="launchAppSuccess" binderror="launchAppError" v-if="data.userId">返回APP</button>
+			<button class="pay" @click="fanhui" v-if="!data.userId">返回首页</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" />
@@ -30,11 +31,11 @@
 					app:false,
 				},
 				appData:{
-					errCOde:0,
+					errCode:0,
 					errStr:null,
 					extMsg:"未支付",
 					extraData:"未支付",
-					openid:null,
+					openId:null,
 					transaction:null,
 					type:"WXLaunchMiniProgramReq.Resp"
 				}
@@ -48,7 +49,7 @@
 			uni.getStorage({
 				key: 'openid',
 				success: function (res) {
-					_this.appData.openid = _this.data.openid
+					_this.appData.openId = _this.data.openid
 					if(data.scene){
 						if(data.scene == "3"){
 							//console.log("app进入 -->支付页")
@@ -84,6 +85,11 @@
 			
 		},
 		methods: {
+			fanhui(){
+				uni.navigateTo({
+					url: `../index/index`
+				});
+			},
 			launchAppError(e) {
 				Toast(e.detail.errMsg)
 			},
@@ -256,6 +262,7 @@
 			margin:70px 2.5% 0;
 			.pay{
 				height: 50px;
+				line-height: 50px;
 				font-size: 18px;
 				border-radius: 10px;
 				margin-top:40px;

+ 2 - 2
pages/over/index.vue

@@ -21,11 +21,11 @@
 				param:undefined,
 				state:false,
 				appData:{
-					errCOde:0,
+					errCode:1,
 					errStr:null,
 					extMsg:"已支付",
 					extraData:"已支付",
-					openId:undefined,
+					openId:null,
 					transaction:null,
 					type:"WXLaunchMiniProgramReq.Resp"
 				}

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/amount/index.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/index.js.map


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/over/index.js.map


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

@@ -177,7 +177,7 @@ var _default = { data: function data() {return { state: false, data: {} };}, onL
     // 对接app测试代码
     // let userId ='0001T110000000002HBL'
     // var  a = {
-    // 	money:1,
+    // 	money:0.1,
     // 	channelId:null,
     // 	userId:'0001T110000000002HBL',
     // 	scene:3,

+ 9 - 3
unpackage/dist/dev/mp-weixin/pages/order/index.js

@@ -159,6 +159,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
 var _toast = _interopRequireDefault(__webpack_require__(/*! ../../wxcomponents/vant/weapp/dist/toast/toast */ 19));
 var _user = __webpack_require__(/*! @/utils/user.js */ 30);function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} //
 //
@@ -179,8 +180,8 @@ var _user = __webpack_require__(/*! @/utils/user.js */ 30);function _interopRequ
 //
 //
 //
-var _default = { data: function 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" } };
-  },
+//
+var _default = { data: function 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: function onLoad(options) {
     //console.log(options)
     var _this = this;
@@ -189,7 +190,7 @@ var _default = { data: function data() {return { loading: false, data: { money:
     uni.getStorage({
       key: 'openid',
       success: function success(res) {
-        _this.appData.openid = _this.data.openid;
+        _this.appData.openId = _this.data.openid;
         if (data.scene) {
           if (data.scene == "3") {
             //console.log("app进入 -->支付页")
@@ -225,6 +226,11 @@ var _default = { data: function data() {return { loading: false, data: { money:
 
   },
   methods: {
+    fanhui: function fanhui() {
+      uni.navigateTo({
+        url: "../index/index" });
+
+    },
     launchAppError: function launchAppError(e) {
       (0, _toast.default)(e.detail.errMsg);
     },

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 1
unpackage/dist/dev/mp-weixin/pages/order/index.wxml


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

@@ -109,6 +109,7 @@
 }
 .mianBox .contentBox .pay_wrap .pay.data-v-0ca91b30 {
   height: 50px;
+  line-height: 50px;
   font-size: 18px;
   border-radius: 10px;
   margin-top: 40px;

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

@@ -171,7 +171,7 @@ var _toast = _interopRequireDefault(__webpack_require__(/*! ../../wxcomponents/v
 //
 //
 //
-var _default = { data: function data() {return { param: undefined, state: false, appData: { errCOde: 0, errStr: null, extMsg: "已支付", extraData: "已支付", openId: undefined, transaction: null, type: "WXLaunchMiniProgramReq.Resp" } };
+var _default = { data: function data() {return { param: undefined, state: false, appData: { errCode: 1, errStr: null, extMsg: "已支付", extraData: "已支付", openId: null, transaction: null, type: "WXLaunchMiniProgramReq.Resp" } };
   },
   onLoad: function onLoad(options) {
     var _this = this;

+ 63 - 33
unpackage/dist/dev/mp-weixin/project.config.json

@@ -1,39 +1,69 @@
 {
-  "description": "项目配置文件。",
-  "packOptions": {
-    "ignore": []
-  },
-  "setting": {
-    "urlCheck": false,
-    "es6": true
-  },
-  "compileType": "miniprogram",
-  "libVersion": "",
-  "appid": "wx40274c2aaec24330",
-  "projectname": "dx",
-  "condition": {
-    "search": {
-      "current": -1,
-      "list": []
+    "description": "项目配置文件。",
+    "packOptions": {
+        "ignore": []
     },
-    "conversation": {
-      "current": -1,
-      "list": []
+    "setting": {
+        "urlCheck": false,
+        "es6": true,
+        "enhance": true,
+        "postcss": true,
+        "preloadBackgroundData": false,
+        "minified": true,
+        "newFeature": false,
+        "coverView": true,
+        "nodeModules": false,
+        "autoAudits": false,
+        "showShadowRootInWxmlPanel": true,
+        "scopeDataCheck": false,
+        "uglifyFileName": false,
+        "checkInvalidKey": true,
+        "checkSiteMap": true,
+        "uploadWithSourceMap": true,
+        "compileHotReLoad": false,
+        "lazyloadPlaceholderEnable": false,
+        "useMultiFrameRuntime": true,
+        "useApiHook": true,
+        "useApiHostProcess": true,
+        "babelSetting": {
+            "ignore": [],
+            "disablePlugins": [],
+            "outputPath": ""
+        },
+        "enableEngineNative": false,
+        "useIsolateContext": true,
+        "userConfirmedBundleSwitch": false,
+        "packNpmManually": false,
+        "packNpmRelationList": [],
+        "minifyWXSS": true,
+        "disableUseStrict": false,
+        "showES6CompileOption": false,
+        "useCompilerPlugins": false,
+        "minifyWXML": true
     },
-    "game": {
-      "current": -1,
-      "list": []
-    },
-    "miniprogram": {
-      "current": 0,
-      "list": [
-        {
-          "name": "",
-          "path": "",
-          "query": "",
-          "id": 0
+    "compileType": "miniprogram",
+    "libVersion": "",
+    "appid": "wx40274c2aaec24330",
+    "projectname": "dx",
+    "condition": {
+        "search": {
+            "list": []
+        },
+        "conversation": {
+            "list": []
+        },
+        "game": {
+            "list": []
+        },
+        "miniprogram": {
+            "list": [
+                {
+                    "name": "",
+                    "path": "",
+                    "query": "",
+                    "id": 0
+                }
+            ]
         }
-      ]
     }
-  }
 }

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.