李天标 4 years ago
parent
commit
88b6e171f8

+ 2 - 3
configs/env.js

@@ -9,9 +9,8 @@ let configs = {
 if (process.env.NODE_ENV === 'development') {
 if (process.env.NODE_ENV === 'development') {
 	// 测试环境
 	// 测试环境
 	configs = Object.assign(configs, {
 	configs = Object.assign(configs, {
-		baseUrl: 'https://app.sunzee.com.cn/ShenzeeServer',
-		// baseUrl: 'http://127.0.0.1:8090',
-		// baseUrl: 'http://127.0.0.1:8686',
+		// baseUrl: 'https://app.sunzee.com.cn/ShenzeeServer',
+		baseUrl: 'http://127.0.0.1:8090',
 	});
 	});
 }
 }
 
 

+ 2 - 3
main.js

@@ -54,9 +54,8 @@ const i18n = new VueI18n({
 });
 });
 
 
 App.mpType = 'app'
 App.mpType = 'app'
-// Vue.prototype.serverurl="http://127.0.0.1:8686";
-// Vue.prototype.serverurl="http://127.0.0.1:8090";
-Vue.prototype.serverurl="https://app.sunzee.com.cn/ShenzeeServer";
+Vue.prototype.serverurl="http://127.0.0.1:8090";
+// Vue.prototype.serverurl="https://app.sunzee.com.cn/ShenzeeServer";
 Vue.prototype.$store = store;
 Vue.prototype.$store = store;
 Vue.prototype._i18n = i18n;
 Vue.prototype._i18n = i18n;
 const app = new Vue({
 const app = new Vue({

+ 12 - 3
packageA/pages/user/orderEit.vue

@@ -3,7 +3,7 @@
 		<form class="form" @submit="orderSubmit">
 		<form class="form" @submit="orderSubmit">
 			<view class="select-input">
 			<view class="select-input">
 				<input class="input" style="display:none;" />
 				<input class="input" style="display:none;" />
-				<text>账户余额:</text><input class="input" name="altAvilBalance" disabled :value="altAvilBalance"/>	
+				<text>账户余额:</text><input class="input" name="altMainBalance" disabled :value="altMainBalance"/>	
 			</view>
 			</view>
 			<view class="select-input">
 			<view class="select-input">
 				<input class="input" style="display:none;" />
 				<input class="input" style="display:none;" />
@@ -52,7 +52,7 @@
 				payDate:null,
 				payDate:null,
 				refundDate:null,
 				refundDate:null,
 				status:null,
 				status:null,
-				altAvilBalance:null
+				altMainBalance:0
 			}
 			}
 		},
 		},
 		onLoad: function(option) {
 		onLoad: function(option) {
@@ -72,6 +72,15 @@
 		},
 		},
 		methods: {
 		methods: {
 			orderSubmit(e) {
 			orderSubmit(e) {
+				var price = this.price;
+				var altMainBalance = this.altMainBalance;
+				if(altMainBalance<price){
+					uni.showToast({
+					    title: '余额不足',
+					    duration: 2000
+					});
+					return;
+				}
 				uni.showModal({
 				uni.showModal({
 					title: '退款',
 					title: '退款',
 					content: '确定执行退款操作?',
 					content: '确定执行退款操作?',
@@ -122,7 +131,7 @@
 					method: "POST",
 					method: "POST",
 					success: (res) => {
 					success: (res) => {
 						var date  = res.data.data;
 						var date  = res.data.data;
-						this.altAvilBalance = date.altAvilBalance;
+						this.altMainBalance = date.altMainBalance;
 					},
 					},
 				});
 				});
 			}
 			}

+ 61 - 29
packageA/pages/user/refuse.vue

@@ -3,29 +3,35 @@
 		<form @submit="selectSubmit" class="form">
 		<form @submit="selectSubmit" class="form">
 			<view class="select-input">
 			<view class="select-input">
 				<input class="input" style="display:none;" />
 				<input class="input" style="display:none;" />
-				<text>订单编号:</text><input class="input" name="orderMumber" 
-					placeholder="请输入订单编号" />
+				<text>订单编号:</text><input class="input" name="orderMumber" placeholder="请输入订单编号" />
 			</view>
 			</view>
 			<view class="select-input">
 			<view class="select-input">
 				<input class="input" style="display:none;" />
 				<input class="input" style="display:none;" />
-				<text>订单流水:</text><input class="input" name="orderWater" placeholder="请输入订单流水后10位" />
+				<text>订单流水:</text><input class="input" name="orderWater" :value="orderWater" placeholder="请输入订单流水后10位" />
+				<button type="primary" @click="saoma()" class="button1">
+					<p class="p">扫码</p>
+				</button>
+			</view>
+			<view class="select-input2">
+				<text class="select-text">点击“扫码”能更方便获取订单流水,它可以去获取保存到手机的支付截图的条形码(订单流水),它也可以直接扫描消费者手机上的支付成功后账单详情中的条形码.如果没有条形码,无法使用扫码,请直接输入.</text>
 			</view>
 			</view>
 			<!-- 时间选择器  start -->
 			<!-- 时间选择器  start -->
 			<mx-date-picker :show="showPicker" :type="type" :value="value" :show-tips="true" :begin-text="'开始'"
 			<mx-date-picker :show="showPicker" :type="type" :value="value" :show-tips="true" :begin-text="'开始'"
-				:end-text="'结束'" :show-seconds="true" @confirm="onSelected" @cancel="onSelected" />
+				:end-text="'结束'" :show-seconds="true" @confirm="onSelected" @cancel="oncancel" />
 			<view class="select-input">
 			<view class="select-input">
 				<input class="input" style="display:none;" />
 				<input class="input" style="display:none;" />
 				<text @click="onShowDatePicker('rangetime')">开始时间:</text><input class="input" name="startDate"
 				<text @click="onShowDatePicker('rangetime')">开始时间:</text><input class="input" name="startDate"
-					:value="startDate" placeholder="点击左边文字选择" />
+					:value="startDate" placeholder="支付开始时间" @click="onShowDatePicker('rangetime')" disabled/>
 			</view>
 			</view>
 			<view class="select-input">
 			<view class="select-input">
 				<input class="input" style="display:none;" />
 				<input class="input" style="display:none;" />
 				<text @click="onShowDatePicker('rangetime')">结束时间:</text><input class="input" name="endDate"
 				<text @click="onShowDatePicker('rangetime')">结束时间:</text><input class="input" name="endDate"
-					:value="endDate" placeholder="点击左边文字选择" />
+					:value="endDate" placeholder="支付结束时间" @click="onShowDatePicker('rangetime')" disabled/>
 			</view>
 			</view>
 			<!-- 时间选择器  end -->
 			<!-- 时间选择器  end -->
 			<view class="select-input">
 			<view class="select-input">
 				<text class="select-text">注意:4个信息,至少填写一个,填写的越多,查出来的越准确.时间跨度不能超过两天。</text>
 				<text class="select-text">注意:4个信息,至少填写一个,填写的越多,查出来的越准确.时间跨度不能超过两天。</text>
+				<!-- <text class="select-text">注意:2个信息,至少填写一个,填写的越多,查出来的越准确.</text> -->
 			</view>
 			</view>
 			<view class="btn-area">
 			<view class="btn-area">
 				<button type="primary" formType="submit">确认</button>
 				<button type="primary" formType="submit">确认</button>
@@ -79,6 +85,7 @@
 				endDate: null,
 				endDate: null,
 				type: 'rangetime',
 				type: 'rangetime',
 				orders: [],
 				orders: [],
+				orderWater:'',
 				value: ''
 				value: ''
 
 
 			};
 			};
@@ -101,16 +108,18 @@
 		methods: {
 		methods: {
 			selectSubmit(e) {
 			selectSubmit(e) {
 				// this.ok = true;
 				// this.ok = true;
-				console.log(e.detail.value);
+				// console.log(e.detail.value);
 				if (e.detail.value.orderMumber != "" || e.detail.value.orderWater != "" || (e.detail.value.startDate !=
 				if (e.detail.value.orderMumber != "" || e.detail.value.orderWater != "" || (e.detail.value.startDate !=
 						"" && e.detail.value.endDate != "")) {
 						"" && e.detail.value.endDate != "")) {
 					var orderMumber = e.detail.value.orderMumber;
 					var orderMumber = e.detail.value.orderMumber;
 					var orderWater = e.detail.value.orderWater;
 					var orderWater = e.detail.value.orderWater;
-					var startDate = e.detail.value.startDate;
-					var endDate = e.detail.value.endDate;
-					if (startDate != "" && endDate != "") {
-						var start = new Date(startDate);
-						var end = new Date(endDate);
+					var startTime = e.detail.value.startDate;
+					var endTime = e.detail.value.endDate;
+					var startDate = '';
+					var endDate = '';
+					if (startTime != null && endTime != null&&startTime != '' && endTime !='') {
+						var start = new Date(startTime);
+						var end = new Date(endTime);
 						var t = end.getTime() - start.getTime();
 						var t = end.getTime() - start.getTime();
 						if (t > 2 * 24 * 60 * 60 * 1000) {
 						if (t > 2 * 24 * 60 * 60 * 1000) {
 							uni.showModal({
 							uni.showModal({
@@ -123,7 +132,14 @@
 							return;
 							return;
 							// console.log("超过2天");
 							// console.log("超过2天");
 						} else {
 						} else {
-
+							var start = new Date(startTime);
+							var A = dateUtils.formateDate(start, 'yyyy-MM-dd');
+							var B = startTime.split(/[\s]/)[1];
+							startDate = A + ' ' + B;
+							var end = new Date(endTime);
+							var C = dateUtils.formateDate(end, 'yyyy-MM-dd');
+							var D = endTime.split(/[\s]/)[1];
+							endDate = C + ' ' + D;
 							// console.log("少于2天");
 							// console.log("少于2天");
 						}
 						}
 
 
@@ -165,22 +181,33 @@
 
 
 
 
 			},
 			},
-			refse(){
-					var token = uni.getStorageSync("token");
-					var globalUser = uni.getStorageSync("globalUser");
-					uni.request({
-						url: this.serverurl + '/TJoinpayMch/refere',
-						data: {
-							"adminId": globalUser.id,
-						},
-						header: {
-							'token': token
-						},
-						method: "POST",
-						success: (res) => {
-							// var date  = res.data.data;
-						},
-					});
+			saoma() {
+				var that = this;
+				// 允许从相机和相册扫码
+				uni.scanCode({
+					success(res) {
+						that.orderWater = res.result;
+						// console.log('条码类型:' + res.scanType);
+						// console.log('条码内容:' + res.result);
+					}
+				});
+			},
+			refse() {
+				var token = uni.getStorageSync("token");
+				var globalUser = uni.getStorageSync("globalUser");
+				uni.request({
+					url: this.serverurl + '/TJoinpayMch/refere',
+					data: {
+						"adminId": globalUser.id,
+					},
+					header: {
+						'token': token
+					},
+					method: "POST",
+					success: (res) => {
+						// var date  = res.data.data;
+					},
+				});
 			},
 			},
 			trantoedit(order) {
 			trantoedit(order) {
 				uni.navigateTo({
 				uni.navigateTo({
@@ -203,6 +230,11 @@
 					//原始的Date对象
 					//原始的Date对象
 					// console.log('date => ' + e.date);
 					// console.log('date => ' + e.date);
 				}
 				}
+			},
+			oncancel(){
+				this.showPicker = false;
+				this.startDate = '';
+				this.endDate = '';
 			}
 			}
 
 
 		}
 		}

+ 42 - 2
packageA/static/common/selectOrder.scss

@@ -21,7 +21,22 @@
 			border-radius: 5upx;
 			border-radius: 5upx;
 		}
 		}
 	}
 	}
-	
+	.select-input2{
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-start;
+		font-size: 26upx;
+		margin: 20upx 0 50upx 30upx;
+		input {
+			padding-left: 20upx;
+			padding-top: 10upx;
+			background-color: #FFFFFF;
+			width: 400upx;
+			height: 50upx;
+			box-shadow: 0upx 0upx 20upx #D3D3D3;
+			border-radius: 5upx;
+		}
+	}
 	.item {
 	.item {
 		box-sizing: border-box;
 		box-sizing: border-box;
 		width: 100%;
 		width: 100%;
@@ -101,4 +116,29 @@
 	}
 	}
 .select-text{
 .select-text{
 	color: #F0AD4E;
 	color: #F0AD4E;
-}
+}
+	.button1 {
+		margin: auto;
+		width: 75upx;
+		height: 50upx;
+	}
+
+	.p {
+		/* #ifdef H5 */
+		top: -13%;
+		/* #endif */
+		width: 50upx;
+		height: 30upx;
+		font-size: 25upx;
+		padding-right: 9upx;
+		padding-top: 6upx;
+		/* #ifndef H5 */
+		/* padding-top: 10upx; */
+		/* #endif */
+
+		position: absolute;
+		/* 水平居中 */
+		left: 50%;
+		-webkit-transform: translateX(-50%);
+		transform: translateX(-50%);
+	}