Merge remote-tracking branch 'origin/master'

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml

@@ -75,6 +75,9 @@
             <if test="order.remark != null and order.remark != ''">
                 and remark = #{order.remark}
             </if>
+            <if test="order.payType != null and order.payType != ''">
+                and pay_type = #{order.payType}
+            </if>
             order by create_time desc
         </where>
     </select>

gasStation-uni/pagesHome/QRcode/QRcode.vue

@@ -133,7 +133,6 @@
 					this.barCode = this.option.code.replace(/(.{4})/g, '$1 ')
 					this.isLook = true
 				}
-				// console.log(this.barCode)
 			},
 			// 倒计时刷新
 			countdown(){
@@ -166,7 +165,6 @@
 					url: 'business/qrCode/createBarCode',
 					method: 'get',
 				}).then(res => {
-					// console.log(res,111)
 					this.option.code = res.data
 					this.barCode = res.data.slice(0,4) + " **** **** " + res.data.slice(res.data.length-5,res.data.length-1)
 				})
@@ -177,7 +175,6 @@
 					url: 'business/qrCode/createQrCode',
 					method: 'get',
 				}).then(res => {
-					// console.log(2222,res)
 					this.options.code = res.data
 				})
 			},

gasStation-uni/pagesLogin/login/login.vue

@@ -61,9 +61,9 @@
 				console.log(e)
 
 				let _this = this;
-				// my.getAuthCode({
+				my.getAuthCode({
-				my.getPhoneNumber({
+				// my.getPhoneNumber({
-					// scopes: 'auth_base',
+					scopes: 'auth_base',
 					success: res => {
 						const authCode = res.authCode;
 						let encryptedData = res.response;

gasStation-uni/pagesMy/myorder/myorder.vue

@@ -33,6 +33,8 @@
 							<!-- <view class="chengg">{{getPayName(payList,item.orderStatus)}}</view> -->
 							<view class="chengg" v-if="item.orderStatus=='paid'">已支付</view>
 							<view class="chengg" v-else-if="item.orderStatus=='payFail'">支付失败</view>
+							<view class="chengg" v-else-if="item.orderStatus=='refund'">已退款</view>
+							<view class="chengg" v-else-if="item.orderStatus=='refunding'">退款中</view>
 							<view class="chengg" v-else>未支付</view>
 						</view>
 
@@ -143,6 +145,7 @@
 					storeId: uni.getStorageSync("storeId"),
 					orderStatus: "",
 					remark: "",
+					payType:uni.getStorageSync("appltType")
 				},
 				map1: {
 					page: 1,
@@ -341,6 +344,7 @@
 						storeId: "",
 						orderStatus: "",
 						remark: "",
+						payType:uni.getStorageSync("appltType")
 					}
 					this.getMyOrder()
 					// this.map1 = {
@@ -356,6 +360,7 @@
 						storeId: "",
 						orderStatus: "unpaid",
 						remark: "",
+						payType:uni.getStorageSync("appltType")
 					}
 					this.getMyOrder()
 					// this.map1 = {
@@ -371,6 +376,7 @@
 						storeId: "",
 						orderStatus: "paid",
 						remark: "",
+						payType:uni.getStorageSync("appltType")
 					}
 					this.getMyOrder()
 					// this.map1 = {
@@ -386,6 +392,7 @@
 						storeId: "",
 						orderStatus: "paid",
 						remark: "",
+						payType:uni.getStorageSync("appltType")
 					}
 					this.getMyOrder()
 					// this.map1 = {