wangtao 3 years ago
parent
commit
c805c12aae
57 changed files with 6389 additions and 186 deletions
  1. 324 0
      .history/pages/amount/index_20220610090432.vue
  2. 119 0
      .history/pages/index/index_20220629085932.vue
  3. 119 0
      .history/pages/index/index_20220629085933.vue
  4. 119 0
      .history/pages/index/index_20220629085946.vue
  5. 119 0
      .history/pages/index/index_20220629085949.vue
  6. 119 0
      .history/pages/index/index_20220629085950.vue
  7. 119 0
      .history/pages/index/index_20220629085951.vue
  8. 119 0
      .history/pages/index/index_20220629085952.vue
  9. 119 0
      .history/pages/index/index_20220629085955.vue
  10. 142 0
      .history/pages/login/index_20220614134521.vue
  11. 142 0
      .history/pages/login/index_20220628085517.vue
  12. 142 0
      .history/pages/login/index_20220629090004.vue
  13. 280 0
      .history/pages/order/index_20220614131036.vue
  14. 283 0
      .history/pages/order/index_20220615231253.vue
  15. 283 0
      .history/pages/order/index_20220615231302.vue
  16. 283 0
      .history/pages/order/index_20220629090017.vue
  17. 169 0
      .history/pages/over/index_20220614130818.vue
  18. 169 0
      .history/pages/over/index_20220614130819.vue
  19. 169 0
      .history/pages/over/index_20220614130820.vue
  20. 169 0
      .history/pages/over/index_20220614131047.vue
  21. 169 0
      .history/pages/over/index_20220614131050.vue
  22. 169 0
      .history/pages/over/index_20220614131103.vue
  23. 169 0
      .history/pages/over/index_20220614131110.vue
  24. 169 0
      .history/pages/over/index_20220614131148.vue
  25. 170 0
      .history/pages/over/index_20220615231341.vue
  26. 170 0
      .history/pages/over/index_20220615231342.vue
  27. 170 0
      .history/pages/over/index_20220615231343.vue
  28. 170 0
      .history/pages/over/index_20220615231344.vue
  29. 170 0
      .history/pages/over/index_20220615231345.vue
  30. 170 0
      .history/pages/over/index_20220615231346.vue
  31. 170 0
      .history/pages/over/index_20220615231347.vue
  32. 170 0
      .history/pages/over/index_20220615231348.vue
  33. 170 0
      .history/pages/over/index_20220615231349.vue
  34. 170 0
      .history/pages/over/index_20220615231350.vue
  35. 170 0
      .history/pages/over/index_20220615231351.vue
  36. 171 0
      .history/pages/over/index_20220629090024.vue
  37. 44 42
      pages/amount/index.vue
  38. 1 2
      pages/index/index.vue
  39. 4 5
      pages/login/index.vue
  40. 5 2
      pages/order/index.vue
  41. 7 5
      pages/over/index.vue
  42. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  43. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/amount/index.js.map
  44. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  45. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map
  46. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/index.js.map
  47. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/over/index.js.map
  48. 16 17
      unpackage/dist/dev/mp-weixin/app.json
  49. 37 37
      unpackage/dist/dev/mp-weixin/pages/amount/index.js
  50. 2 0
      unpackage/dist/dev/mp-weixin/pages/amount/index.wxss
  51. 1 2
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  52. 4 5
      unpackage/dist/dev/mp-weixin/pages/login/index.js
  53. 1 1
      unpackage/dist/dev/mp-weixin/pages/login/index.wxml
  54. 4 1
      unpackage/dist/dev/mp-weixin/pages/order/index.js
  55. 5 3
      unpackage/dist/dev/mp-weixin/pages/over/index.js
  56. 1 1
      unpackage/dist/dev/mp-weixin/pages/over/index.wxml
  57. 33 63
      unpackage/dist/dev/mp-weixin/project.config.json

+ 324 - 0
.history/pages/amount/index_20220610090432.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>

+ 119 - 0
.history/pages/index/index_20220629085932.vue

@@ -0,0 +1,119 @@
+<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) {
+			// 对接app测试代码
+					// let userId ='0001T110000000002HBL'
+					// var  a = {
+					// 	money:0.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>
+

+ 119 - 0
.history/pages/index/index_20220629085933.vue

@@ -0,0 +1,119 @@
+<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) {
+			// 对接app测试代码
+					// let userId ='0001T110000000002HBL'
+					// var  a = {
+					// 	money:0.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>
+

+ 119 - 0
.history/pages/index/index_20220629085946.vue

@@ -0,0 +1,119 @@
+<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) {
+			// 对接app测试代码(yingli)
+					// let userId ='0001T110000000002HBL'
+					// var  a = {
+					// 	money:0.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>
+

+ 119 - 0
.history/pages/index/index_20220629085949.vue

@@ -0,0 +1,119 @@
+<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) {
+			// 对接app测试代码(yingli)
+					// let userId ='0001T110000000002HBL'
+					// var  a = {
+					// 	money:0.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>
+

+ 119 - 0
.history/pages/index/index_20220629085950.vue

@@ -0,0 +1,119 @@
+<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) {
+			// 对接app测试代码(yingli)
+					// let userId ='0001T110000000002HBL'
+					// var  a = {
+					// 	money:0.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>
+

+ 119 - 0
.history/pages/index/index_20220629085951.vue

@@ -0,0 +1,119 @@
+<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) {
+			// 对接app测试代码(yingli)
+					// let userId ='0001T110000000002HBL'
+					// var  a = {
+					// 	money:0.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>
+

+ 119 - 0
.history/pages/index/index_20220629085952.vue

@@ -0,0 +1,119 @@
+<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) {
+			// 对接app测试代码(yingli)
+					// let userId ='0001T110000000002HBL'
+					// var  a = {
+					// 	money:0.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>
+

+ 119 - 0
.history/pages/index/index_20220629085955.vue

@@ -0,0 +1,119 @@
+<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) {
+			// 对接app测试代码(yingli)
+					// let userId ='0001T110000000002HBL'
+					// var  a = {
+					// 	money:0.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>
+

+ 142 - 0
.history/pages/login/index_20220614134521.vue

@@ -0,0 +1,142 @@
+<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/logo.png')" /></van-col>
+			<van-col span="24" class="authorized_app">申请获取以下权限</van-col>
+			<van-col span="24" class="authorized_text">获取你的昵称、头像、地区及性别</br>
+			(用于园区内一卡通余额充值)</van-col>
+		</van-row>
+		<div class="authorize_wrap">
+			<van-button loading type="info" loading-text="授权登录中..."  v-if="login" color="#F22E3C"/>
+			<van-button v-if="!login" class="authorize authorize_y"  color="#F22E3C"   open-type="getUserInfo" lang="zh_CN" @getuserinfo="checkLogin" >授权登录</van-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 {
+				data:{
+					money:undefined,
+					openid:undefined,
+				},
+				login:false
+				
+			}
+		},
+		onLoad(options) {
+			let _this = this
+			// money=${this.money}&scene=3&userId=${localStorage.getItem("user_wt")}&channelId=null&openid=null
+			let data = JSON.parse(options.params)
+			_this.data = data
+		},
+		methods: {
+			checkLogin(e){
+				let _this = this
+				_this.login = true
+				if(e.detail.userInfo) {
+					uni.login({
+						success: function(res) {
+							if(res.code){
+								uni.setStorage({
+								   key: 'code', 
+								   data: res.code, 
+								})
+							}
+							uni.request({
+								url:  `https://smartpark.caih.com/dxapi/wxLogin?jsCode=${res.code}`,
+								method: 'GET',
+								success: function (res2) {
+									uni.setStorage({
+									   key: 'openid', 
+									   data: res2.data.data, 
+									   success: function () {
+											_this.data.openid= res2.data.data
+											uni.navigateTo({
+											    url: `../order/index?params=${JSON.stringify(_this.data)}`
+											});
+									   }
+									})
+									
+								}
+							})
+						},
+					})
+				}else{
+				  //console.log('拒绝授权')
+				  uni.navigateTo({
+				      url: '../index/index'
+				  });
+				}
+			},
+		}
+	}
+</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;
+		.logo{
+			/deep/ .van-image{
+				margin:0 auto;
+				display: block;
+			}
+		}
+		.authorized_app{
+			text-align: center;
+			color: #000;
+			display: block;
+			/deep/ .van-col{
+				font-size: 30rpx;
+				font-weight: 700;
+				margin-top:30px;
+			}
+		}
+		.authorized_text{
+			width:80%;
+			margin-left:10%;
+			display: block;
+			text-align: center;
+			line-height: 30px;
+			color: #777;
+			/deep/ .van-col{
+				font-size: 30rpx;
+				margin-top: 20px;
+			}
+		}
+		/deep/ .van-button{
+			border-radius: 6px;
+			width: 100% !important;
+			margin-top:25px;
+			letter-spacing: 2px;
+			font-size: 18px;
+			height: 50px;
+		}
+		.authorize_wrap{
+			width:95%;
+			margin:70px 2.5% 0;
+			.authorize{
+				height: 50px;
+				font-size: 18px;
+				border-radius: 10px;
+				margin-top:40px;
+			}
+		}
+    }
+}
+</style>
+

+ 142 - 0
.history/pages/login/index_20220628085517.vue

@@ -0,0 +1,142 @@
+<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/logo.png')" /></van-col>
+			<van-col span="24" class="authorized_app">申请获取以下权限</van-col>
+			<van-col span="24" class="authorized_text">获取你的昵称、头像、地区及性别</br>
+			(用于园区内一卡通余额充值)</van-col>
+		</van-row>
+		<div class="authorize_wrap">
+			<van-button loading type="info" loading-text="授权登录中..."  v-if="login" color="#F22E3C"/>
+			<van-button v-if="!login" class="authorize authorize_y"  color="#F22E3C"   open-type="getUserInfo" lang="zh_CN" @getuserinfo="checkLogin" >授权登录</van-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 {
+				data:{
+					money:undefined,
+					openid:undefined,
+				},
+				login:false
+				
+			}
+		},
+		onLoad(options) {
+			let _this = this
+			// money=${this.money}&scene=3&userId=${localStorage.getItem("user_wt")}&channelId=null&openid=null
+			let data = JSON.parse(options.params)
+			_this.data = data
+		},
+		methods: {
+			checkLogin(e){
+				let _this = this
+				_this.login = true
+				if(e.detail.userInfo) {
+					uni.login({
+						success: function(res) {
+							if(res.code){
+								uni.setStorage({
+								   key: 'code', 
+								   data: res.code, 
+								})
+							}
+							uni.request({
+								url:  `https://smartpark.caih.com/dxapi/wxLogin?jsCode=${res.code}`,
+								method: 'GET',
+								success: function (res2) {
+									uni.setStorage({
+									   key: 'openid', 
+									   data: res2.data.data, 
+									   success: function () {
+											_this.data.openid= res2.data.data
+											uni.navigateTo({
+											    url: `../order/index?params=${JSON.stringify(_this.data)}`
+											});
+									   }
+									})
+									
+								}
+							})
+						},
+					})
+				}else{
+				  //console.log('拒绝授权')
+				  uni.navigateTo({
+				      url: '../index/index'
+				  });
+				}
+			},
+		}
+	}
+</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;
+		.logo{
+			/deep/ .van-image{
+				margin:0 auto;
+				display: block;
+			}
+		}
+		.authorized_app{
+			text-align: center;
+			color: #000;
+			display: block;
+			/deep/ .van-col{
+				font-size: 30rpx;
+				font-weight: 700;
+				margin-top:30px;
+			}
+		}
+		.authorized_text{
+			width:80%;
+			margin-left:10%;
+			display: block;
+			text-align: center;
+			line-height: 30px;
+			color: #777;
+			/deep/ .van-col{
+				font-size: 30rpx;
+				margin-top: 20px;
+			}
+		}
+		/deep/ .van-button{
+			border-radius: 6px;
+			width: 100% !important;
+			margin-top:25px;
+			letter-spacing: 2px;
+			font-size: 18px;
+			height: 50px;
+		}
+		.authorize_wrap{
+			width:95%;
+			margin:70px 2.5% 0;
+			.authorize{
+				height: 50px;
+				font-size: 18px;
+				border-radius: 10px;
+				margin-top:40px;
+			}
+		}
+    }
+}
+</style>
+

+ 142 - 0
.history/pages/login/index_20220629090004.vue

@@ -0,0 +1,142 @@
+<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/logo.png')" /></van-col>
+			<van-col span="24" class="authorized_app">申请获取以下权限</van-col>
+			<van-col span="24" class="authorized_text">获取你的昵称、头像、地区及性别</br>
+			(用于园区内一卡通余额充值)</van-col>
+		</van-row>
+		<div class="authorize_wrap">
+			<van-button loading type="info" loading-text="授权登录中..."  v-if="login" color="#F22E3C"/>
+			<van-button v-if="!login" class="authorize authorize_y"  color="#F22E3C"   open-type="getUserInfo" lang="zh_CN" @getuserinfo="checkLogin" >授权登录</van-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 {
+				data:{
+					money:undefined,
+					openid:undefined,
+				},
+				login:false
+				
+			}
+		},
+		onLoad(options) {
+			let _this = this
+			// money=${this.money}&scene=3&userId=${localStorage.getItem("user_wt")}&channelId=null&openid=null
+			let data = JSON.parse(options.params)
+			_this.data = data
+		},
+		methods: {
+			checkLogin(e){
+				let _this = this
+				_this.login = true
+				if(e.detail.userInfo) {
+					uni.login({
+						success: function(res) {
+							if(res.code){
+								uni.setStorage({
+								   key: 'code', 
+								   data: res.code, 
+								})
+							}
+							uni.request({
+								url:  `https://smartpark.caih.com/dxapi/wxLogin?jsCode=${res.code}`,
+								method: 'GET',
+								success: function (res2) {
+									uni.setStorage({
+									   key: 'openid', 
+									   data: res2.data.data, 
+									   success: function () {
+											_this.data.openid= res2.data.data
+											uni.navigateTo({
+											    url: `../order/index?params=${JSON.stringify(_this.data)}`
+											});
+									   }
+									})
+									
+								}
+							})
+						},
+					})
+				}else{
+				  //console.log('拒绝授权')
+				  uni.navigateTo({
+				      url: '../index/index'
+				  });
+				}
+			},
+		}
+	}
+</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;
+		.logo{
+			/deep/ .van-image{
+				margin:0 auto;
+				display: block;
+			}
+		}
+		.authorized_app{
+			text-align: center;
+			color: #000;
+			display: block;
+			/deep/ .van-col{
+				font-size: 30rpx;
+				font-weight: 700;
+				margin-top:30px;
+			}
+		}
+		.authorized_text{
+			width:80%;
+			margin-left:10%;
+			display: block;
+			text-align: center;
+			line-height: 30px;
+			color: #777;
+			/deep/ .van-col{
+				font-size: 30rpx;
+				margin-top: 20px;
+			}
+		}
+		/deep/ .van-button{
+			border-radius: 6px;
+			width: 100% !important;
+			margin-top:25px;
+			letter-spacing: 2px;
+			font-size: 18px;
+			height: 50px;
+		}
+		.authorize_wrap{
+			width:95%;
+			margin:70px 2.5% 0;
+			.authorize{
+				height: 50px;
+				font-size: 18px;
+				border-radius: 10px;
+				margin-top:40px;
+			}
+		}
+    }
+}
+</style>
+

+ 280 - 0
.history/pages/order/index_20220614131036.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>
+
+

+ 283 - 0
.history/pages/order/index_20220615231253.vue

@@ -0,0 +1,283 @@
+<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:"1",
+					openId:null,
+					st:undefined,
+					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
+					_this.appData.st = 0
+					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>
+
+

+ 283 - 0
.history/pages/order/index_20220615231302.vue

@@ -0,0 +1,283 @@
+<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:"1",
+					openId:null,
+					st:undefined,
+					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
+					_this.appData.st = 0
+					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>
+
+

+ 283 - 0
.history/pages/order/index_20220629090017.vue

@@ -0,0 +1,283 @@
+<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:"1",
+					openId:null,
+					st:0,
+					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
+					_this.appData.st = 0
+					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>
+
+

+ 169 - 0
.history/pages/over/index_20220614130818.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:"com.launchMiniProgram"
+				}
+			}
+		},
+		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_20220614130819.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:"com.launchMiniProgram"
+				}
+			}
+		},
+		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_20220614130820.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:"com.launchMiniProgram"
+				}
+			}
+		},
+		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_20220614131047.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>
+
+

+ 169 - 0
.history/pages/over/index_20220614131050.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>
+
+

+ 169 - 0
.history/pages/over/index_20220614131103.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>
+
+

+ 169 - 0
.history/pages/over/index_20220614131110.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>
+
+

+ 169 - 0
.history/pages/over/index_20220614131148.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>
+
+

+ 170 - 0
.history/pages/over/index_20220615231341.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:"1",
+					st:undefined,
+					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.st = 1
+					}
+				}
+			})
+			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>
+
+

+ 170 - 0
.history/pages/over/index_20220615231342.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:"1",
+					st:undefined,
+					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.st = 1
+					}
+				}
+			})
+			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>
+
+

+ 170 - 0
.history/pages/over/index_20220615231343.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:"1",
+					st:undefined,
+					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.st = 1
+					}
+				}
+			})
+			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>
+
+

+ 170 - 0
.history/pages/over/index_20220615231344.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:"1",
+					st:undefined,
+					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.st = 1
+					}
+				}
+			})
+			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>
+
+

+ 170 - 0
.history/pages/over/index_20220615231345.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:"1",
+					st:undefined,
+					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.st = 1
+					}
+				}
+			})
+			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>
+
+

+ 170 - 0
.history/pages/over/index_20220615231346.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:"1",
+					st:undefined,
+					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.st = 1
+					}
+				}
+			})
+			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>
+
+

+ 170 - 0
.history/pages/over/index_20220615231347.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:"1",
+					st:undefined,
+					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.st = 1
+					}
+				}
+			})
+			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>
+
+

+ 170 - 0
.history/pages/over/index_20220615231348.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:"1",
+					st:undefined,
+					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.st = 1
+					}
+				}
+			})
+			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>
+
+

+ 170 - 0
.history/pages/over/index_20220615231349.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:"1",
+					st:undefined,
+					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.st = 1
+					}
+				}
+			})
+			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>
+
+

+ 170 - 0
.history/pages/over/index_20220615231350.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:"1",
+					st:undefined,
+					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.st = 1
+					}
+				}
+			})
+			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>
+
+

+ 170 - 0
.history/pages/over/index_20220615231351.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:"1",
+					st:undefined,
+					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.st = 1
+					}
+				}
+			})
+			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>
+
+

+ 171 - 0
.history/pages/over/index_20220629090024.vue

@@ -0,0 +1,171 @@
+<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="appData2"  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,
+				appData2:{
+					errCode:1,
+					errStr:null,
+					extMsg:"已支付",
+					extraData:"1",
+					st:1,
+					openId:null,
+					transaction:null,
+					type:"WXLaunchMiniProgramReq.Resp"
+				}
+			}
+		},
+		onLoad(options) {
+			let _this = this
+			uni.getStorage({
+				key:"openid",
+				success(e){
+					if(e.data){
+						_this.appData2.openId = e.data
+						_this.appData2.st = 1
+					}
+				}
+				
+			})
+			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>
+
+

+ 44 - 42
pages/amount/index.vue

@@ -50,12 +50,12 @@ export default {
       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;",
+      state1:"color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      state2:"color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      state3:"color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      state4:"color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      state5:"color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      state6:"color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
 	  data:{
 		  money: "0",
 		  openid:null
@@ -132,12 +132,12 @@ export default {
 		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.state1 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+		this.state2 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+		this.state3 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+		this.state4 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+		this.state5 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+		this.state6 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
 		this.data.money = this.data.money + "";
 	},
 
@@ -162,55 +162,55 @@ export default {
     // },
     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.state2 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state3 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state4 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state5 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state6 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
       this.data.money = 50
     },
     btn100() {
-      this.state1 = "color:#000;background: #ccc;",
+      this.state1 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
       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.state3 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state4 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state5 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state6 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
       this.data.money = 100
     },
     btn150() {
-      this.state1 = "color:#000;background: #ccc;",
-      this.state2 = "color:#000;background: #ccc;",
+      this.state1 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state2 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
       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.state4 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state5 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state6 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
       this.data.money = 150
     },
     btn200() {
-      this.state1 = "color:#000;background: #ccc;",
-      this.state2 = "color:#000;background: #ccc;",
-      this.state3 = "color:#000;background: #ccc;",
+      this.state1 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state2 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state3 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
       this.state4 = "color:#fff;background: rgba(242, 46, 60, 1);",
-      this.state5 = "color:#000;background: #ccc;",
-      this.state6 = "color:#000;background: #ccc;",
+      this.state5 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state6 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
       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.state1 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state2 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state3 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state4 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
       this.state5 = "color:#fff;background: rgba(242, 46, 60, 1);",
-      this.state6 = "color:#000;background: #ccc;",
+      this.state6 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
       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.state1 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state2 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state3 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state4 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state5 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
       this.state6 = "color:#fff;background: rgba(242, 46, 60, 1);",
       this.data.money = 300
     },
@@ -276,6 +276,8 @@ export default {
 			margin-top:20px;
 			float:left;
 			width:28%;
+			box-sizing: border-box;
+			border:1px solid transparent;
 		}
 		.van-col.active{
 			background: rgba(242, 46, 60, 1);

+ 1 - 2
pages/index/index.vue

@@ -21,8 +21,7 @@
 			}
 		},
 		onLoad(options) {
-			//Toast("该用户未暂未录入充值系统...")
-			// 对接app测试代码
+			// 对接app测试代码(yingli)
 					// let userId ='0001T110000000002HBL'
 					// var  a = {
 					// 	money:0.1,

+ 4 - 5
pages/login/index.vue

@@ -8,7 +8,8 @@
 			(用于园区内一卡通余额充值)</van-col>
 		</van-row>
 		<div class="authorize_wrap">
-			<van-button class="authorize authorize_y"  color="#F22E3C"   open-type="getUserInfo" lang="zh_CN" @getuserinfo="checkLogin" >授权登录</van-button>
+			<van-button loading type="info" loading-text="授权登录中..."  v-if="login" color="#F22E3C"/>
+			<van-button v-if="!login" class="authorize authorize_y"  color="#F22E3C"   open-type="getUserInfo" lang="zh_CN" @getuserinfo="checkLogin" >授权登录</van-button>
 		</div>
 		<van-toast id="van-toast" />
 	</van-row>
@@ -24,6 +25,7 @@
 					money:undefined,
 					openid:undefined,
 				},
+				login:false
 				
 			}
 		},
@@ -36,6 +38,7 @@
 		methods: {
 			checkLogin(e){
 				let _this = this
+				_this.login = true
 				if(e.detail.userInfo) {
 					uni.login({
 						success: function(res) {
@@ -46,12 +49,8 @@
 								})
 							}
 							uni.request({
-								// url:  `http://172.16.120.104:8085/wxLogin?jsCode=${res.code}`,
 								url:  `https://smartpark.caih.com/dxapi/wxLogin?jsCode=${res.code}`,
 								method: 'GET',
-								// header: {
-								//     'content-type': 'application/x-www-form-urlencoded'
-								// },
 								success: function (res2) {
 									uni.setStorage({
 									   key: 'openid', 

+ 5 - 2
pages/order/index.vue

@@ -34,11 +34,12 @@
 					errCode:0,
 					errStr:null,
 					extMsg:"未支付",
-					extraData:"未支付",
+					extraData:"1",
 					openId:null,
+					st:0,
 					transaction:null,
 					type:"WXLaunchMiniProgramReq.Resp"
-				}
+				},
 			}
 		},
 		onLoad(options) {
@@ -50,6 +51,7 @@
 				key: 'openid',
 				success: function (res) {
 					_this.appData.openId = _this.data.openid
+					_this.appData.st = 0
 					if(data.scene){
 						if(data.scene == "3"){
 							//console.log("app进入 -->支付页")
@@ -95,6 +97,7 @@
 			},
 			// 关闭小程序
 			launchAppSuccess(){
+				
 				wx.exitMiniProgram({success: (res) => {}})
 			},
 			pay(){

+ 7 - 5
pages/over/index.vue

@@ -6,7 +6,7 @@
 			<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" open-type="launchApp" app-parameter="appData2"  bindlaunchapp="launchAppSuccess" binderror="launchAppError" v-if="state">返回APP</button>
 			<button class="pay"  v-if="!state" @tap ="home">返回首页</button>
 		</div>
 		<van-toast id="van-toast" />
@@ -20,11 +20,12 @@
 			return {
 				param:undefined,
 				state:false,
-				appData:{
+				appData2:{
 					errCode:1,
 					errStr:null,
 					extMsg:"已支付",
-					extraData:"已支付",
+					extraData:"1",
+					st:1,
 					openId:null,
 					transaction:null,
 					type:"WXLaunchMiniProgramReq.Resp"
@@ -37,10 +38,11 @@
 				key:"openid",
 				success(e){
 					if(e.data){
-						_this.appData.openId = e.data
-						_this.appData = JSON.stringify(_this.appData)
+						_this.appData2.openId = e.data
+						_this.appData2.st = 1
 					}
 				}
+				
 			})
 			if(!options.type){
 				this.state = true	

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/amount/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/over/index.js.map


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

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

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

@@ -217,7 +217,7 @@ var _dialog = _interopRequireDefault(__webpack_require__(/*! ../../wxcomponents/
 //
 //
 var _default = { data: function 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: function money(val) {// if (/^0[1-9]/.test(val)) {
+      state1: "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);", state2: "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);", state3: "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);", state4: "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);", state5: "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);", state6: "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);", data: { money: "0", openid: null } };}, watch: { money: function money(val) {// if (/^0[1-9]/.test(val)) {
       //   this.data.money = val.substring(1);
       // }
     } }, components: {// [Field.name]: Field,
@@ -264,12 +264,12 @@ var _default = { data: function data() {return { show: false, loading: false, ov
       this.$nextTick(function () {
         _this2.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.state1 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state2 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state3 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state4 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state5 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state6 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
       this.data.money = this.data.money + "";
     },
 
@@ -294,55 +294,55 @@ var _default = { data: function data() {return { show: false, loading: false, ov
     // },
     btn50: function 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.state2 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state3 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state4 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state5 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state6 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
       this.data.money = 50;
     },
     btn100: function btn100() {
-      this.state1 = "color:#000;background: #ccc;",
+      this.state1 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
       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.state3 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state4 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state5 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state6 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
       this.data.money = 100;
     },
     btn150: function btn150() {
-      this.state1 = "color:#000;background: #ccc;",
-      this.state2 = "color:#000;background: #ccc;",
+      this.state1 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state2 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
       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.state4 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state5 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state6 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
       this.data.money = 150;
     },
     btn200: function btn200() {
-      this.state1 = "color:#000;background: #ccc;",
-      this.state2 = "color:#000;background: #ccc;",
-      this.state3 = "color:#000;background: #ccc;",
+      this.state1 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state2 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state3 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
       this.state4 = "color:#fff;background: rgba(242, 46, 60, 1);",
-      this.state5 = "color:#000;background: #ccc;",
-      this.state6 = "color:#000;background: #ccc;",
+      this.state5 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state6 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
       this.data.money = 200;
     },
     btn250: function 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.state1 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state2 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state3 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state4 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
       this.state5 = "color:#fff;background: rgba(242, 46, 60, 1);",
-      this.state6 = "color:#000;background: #ccc;",
+      this.state6 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
       this.data.money = 250;
     },
     btn300: function 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.state1 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state2 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state3 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state4 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      this.state5 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
       this.state6 = "color:#fff;background: rgba(242, 46, 60, 1);",
       this.data.money = 300;
     } } };exports.default = _default;

+ 2 - 0
unpackage/dist/dev/mp-weixin/pages/amount/index.wxss

@@ -78,6 +78,8 @@
   margin-top: 20px;
   float: left;
   width: 28%;
+  box-sizing: border-box;
+  border: 1px solid transparent;
 }
 .mianBox .select_amount .van-col.active.data-v-43870bd4 {
   background: #f22e3c;

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

@@ -173,8 +173,7 @@ var _toast = _interopRequireDefault(__webpack_require__(/*! ../../wxcomponents/v
 //
 //
 //
-var _default = { data: function data() {return { state: false, data: {} };}, onLoad: function onLoad(options) {//Toast("该用户未暂未录入充值系统...")
-    // 对接app测试代码
+var _default = { data: function data() {return { state: false, data: {} };}, onLoad: function onLoad(options) {// 对接app测试代码(yingli)
     // let userId ='0001T110000000002HBL'
     // var  a = {
     // 	money:0.1,

+ 4 - 5
unpackage/dist/dev/mp-weixin/pages/login/index.js

@@ -157,6 +157,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
 var _toast = _interopRequireDefault(__webpack_require__(/*! ../../wxcomponents/vant/weapp/dist/toast/toast */ 19));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} //
 //
 //
@@ -173,11 +174,13 @@ var _toast = _interopRequireDefault(__webpack_require__(/*! ../../wxcomponents/v
 //
 //
 //
-var _default = { data: function data() {return { data: { money: undefined, openid: undefined } };}, onLoad: function onLoad(options) {var _this = this; // money=${this.money}&scene=3&userId=${localStorage.getItem("user_wt")}&channelId=null&openid=null
+//
+var _default = { data: function data() {return { data: { money: undefined, openid: undefined }, login: false };}, onLoad: function onLoad(options) {var _this = this; // money=${this.money}&scene=3&userId=${localStorage.getItem("user_wt")}&channelId=null&openid=null
     var data = JSON.parse(options.params);_this.data = data;},
   methods: {
     checkLogin: function checkLogin(e) {
       var _this = this;
+      _this.login = true;
       if (e.detail.userInfo) {
         uni.login({
           success: function success(res) {
@@ -188,12 +191,8 @@ var _default = { data: function data() {return { data: { money: undefined, openi
 
             }
             uni.request({
-              // url:  `http://172.16.120.104:8085/wxLogin?jsCode=${res.code}`,
               url: "https://smartpark.caih.com/dxapi/wxLogin?jsCode=".concat(res.code),
               method: 'GET',
-              // header: {
-              //     'content-type': 'application/x-www-form-urlencoded'
-              // },
               success: function success(res2) {
                 uni.setStorage({
                   key: 'openid',

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

@@ -1 +1 @@
-<view class="mianBox _div data-v-4586967a"><van-row class="contentBox data-v-4586967a" vue-id="6b4b36ba-1" data-com-type="wx" bind:__l="__l" vue-slots="{{['default']}}"><van-row vue-id="{{('6b4b36ba-2')+','+('6b4b36ba-1')}}" data-com-type="wx" class="data-v-4586967a" bind:__l="__l" vue-slots="{{['default']}}"><van-col class="logo data-v-4586967a" vue-id="{{('6b4b36ba-3')+','+('6b4b36ba-2')}}" span="24" data-com-type="wx" bind:__l="__l" vue-slots="{{['default']}}"><van-image vue-id="{{('6b4b36ba-4')+','+('6b4b36ba-3')}}" width="75" height="75" src="{{$root.m0}}" data-com-type="wx" class="data-v-4586967a" bind:__l="__l"></van-image></van-col><van-col class="authorized_app data-v-4586967a" vue-id="{{('6b4b36ba-5')+','+('6b4b36ba-2')}}" span="24" data-com-type="wx" bind:__l="__l" vue-slots="{{['default']}}">申请获取以下权限</van-col><van-col class="authorized_text data-v-4586967a" vue-id="{{('6b4b36ba-6')+','+('6b4b36ba-2')}}" span="24" data-com-type="wx" bind:__l="__l" vue-slots="{{['default']}}">获取你的昵称、头像、地区及性别<view class="_br data-v-4586967a"></view>(用于园区内一卡通余额充值)</van-col></van-row><view class="authorize_wrap _div data-v-4586967a"><van-button class="authorize authorize_y data-v-4586967a" vue-id="{{('6b4b36ba-7')+','+('6b4b36ba-1')}}" color="#F22E3C" open-type="getUserInfo" lang="zh_CN" data-event-opts="{{[['^getuserinfo',[['checkLogin']]]]}}" data-com-type="wx" bind:getuserinfo="__e" bind:__l="__l" vue-slots="{{['default']}}">授权登录</van-button></view><van-toast vue-id="{{('6b4b36ba-8')+','+('6b4b36ba-1')}}" id="van-toast" data-com-type="wx" class="data-v-4586967a" bind:__l="__l"></van-toast></van-row></view>
+<view class="mianBox _div data-v-4586967a"><van-row class="contentBox data-v-4586967a" vue-id="6b4b36ba-1" data-com-type="wx" bind:__l="__l" vue-slots="{{['default']}}"><van-row vue-id="{{('6b4b36ba-2')+','+('6b4b36ba-1')}}" data-com-type="wx" class="data-v-4586967a" bind:__l="__l" vue-slots="{{['default']}}"><van-col class="logo data-v-4586967a" vue-id="{{('6b4b36ba-3')+','+('6b4b36ba-2')}}" span="24" data-com-type="wx" bind:__l="__l" vue-slots="{{['default']}}"><van-image vue-id="{{('6b4b36ba-4')+','+('6b4b36ba-3')}}" width="75" height="75" src="{{$root.m0}}" data-com-type="wx" class="data-v-4586967a" bind:__l="__l"></van-image></van-col><van-col class="authorized_app data-v-4586967a" vue-id="{{('6b4b36ba-5')+','+('6b4b36ba-2')}}" span="24" data-com-type="wx" bind:__l="__l" vue-slots="{{['default']}}">申请获取以下权限</van-col><van-col class="authorized_text data-v-4586967a" vue-id="{{('6b4b36ba-6')+','+('6b4b36ba-2')}}" span="24" data-com-type="wx" bind:__l="__l" vue-slots="{{['default']}}">获取你的昵称、头像、地区及性别<view class="_br data-v-4586967a"></view>(用于园区内一卡通余额充值)</van-col></van-row><view class="authorize_wrap _div data-v-4586967a"><block wx:if="{{login}}"><van-button vue-id="{{('6b4b36ba-7')+','+('6b4b36ba-1')}}" loading="{{true}}" type="info" loading-text="授权登录中..." color="#F22E3C" data-com-type="wx" class="data-v-4586967a" bind:__l="__l"></van-button></block><block wx:if="{{!login}}"><van-button class="authorize authorize_y data-v-4586967a" vue-id="{{('6b4b36ba-8')+','+('6b4b36ba-1')}}" color="#F22E3C" open-type="getUserInfo" lang="zh_CN" data-event-opts="{{[['^getuserinfo',[['checkLogin']]]]}}" data-com-type="wx" bind:getuserinfo="__e" bind:__l="__l" vue-slots="{{['default']}}">授权登录</van-button></block></view><van-toast vue-id="{{('6b4b36ba-9')+','+('6b4b36ba-1')}}" id="van-toast" data-com-type="wx" class="data-v-4586967a" bind:__l="__l"></van-toast></van-row></view>

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

@@ -181,7 +181,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: "1", openId: null, st: 0, transaction: null, type: "WXLaunchMiniProgramReq.Resp" } };
+  },
   onLoad: function onLoad(options) {
     //console.log(options)
     var _this = this;
@@ -191,6 +192,7 @@ var _default = { data: function data() {return { loading: false, data: { money:
       key: 'openid',
       success: function success(res) {
         _this.appData.openId = _this.data.openid;
+        _this.appData.st = 0;
         if (data.scene) {
           if (data.scene == "3") {
             //console.log("app进入 -->支付页")
@@ -236,6 +238,7 @@ var _default = { data: function data() {return { loading: false, data: { money:
     },
     // 关闭小程序
     launchAppSuccess: function launchAppSuccess() {
+
       wx.exitMiniProgram({ success: function success(res) {} });
     },
     pay: function pay() {

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

@@ -171,7 +171,8 @@ var _toast = _interopRequireDefault(__webpack_require__(/*! ../../wxcomponents/v
 //
 //
 //
-var _default = { data: function data() {return { param: undefined, state: false, appData: { errCode: 1, errStr: null, extMsg: "已支付", extraData: "已支付", openId: null, transaction: null, type: "WXLaunchMiniProgramReq.Resp" } };
+var _default = { data: function data() {return { param: undefined, state: false, appData2: { errCode: 1, errStr: null, extMsg: "已支付", extraData: "1", st: 1, openId: null, transaction: null, type: "WXLaunchMiniProgramReq.Resp" } };
+
   },
   onLoad: function onLoad(options) {
     var _this = this;
@@ -179,11 +180,12 @@ var _default = { data: function data() {return { param: undefined, state: false,
       key: "openid",
       success: function success(e) {
         if (e.data) {
-          _this.appData.openId = e.data;
-          _this.appData = JSON.stringify(_this.appData);
+          _this.appData2.openId = e.data;
+          _this.appData2.st = 1;
         }
       } });
 
+
     if (!options.type) {
       this.state = true;
     } else {

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

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

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

@@ -1,69 +1,39 @@
 {
-    "description": "项目配置文件。",
-    "packOptions": {
-        "ignore": []
+  "description": "项目配置文件。",
+  "packOptions": {
+    "ignore": []
+  },
+  "setting": {
+    "urlCheck": false,
+    "es6": true
+  },
+  "compileType": "miniprogram",
+  "libVersion": "",
+  "appid": "wx40274c2aaec24330",
+  "projectname": "dx",
+  "condition": {
+    "search": {
+      "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
+    "conversation": {
+      "current": -1,
+      "list": []
     },
-    "compileType": "miniprogram",
-    "libVersion": "",
-    "appid": "wx40274c2aaec24330",
-    "projectname": "dx",
-    "condition": {
-        "search": {
-            "list": []
-        },
-        "conversation": {
-            "list": []
-        },
-        "game": {
-            "list": []
-        },
-        "miniprogram": {
-            "list": [
-                {
-                    "name": "",
-                    "path": "",
-                    "query": "",
-                    "id": 0
-                }
-            ]
+    "game": {
+      "current": -1,
+      "list": []
+    },
+    "miniprogram": {
+      "current": 0,
+      "list": [
+        {
+          "name": "",
+          "path": "",
+          "query": "",
+          "id": 0
         }
+      ]
     }
+  }
 }

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