小程序支付

fuintBackend/configure/dev/application.properties

@@ -88,9 +88,13 @@ weixin.official.appSecret=1f55e8749332234d9a074873d8e6a3
 
 # \u5C0F\u7A0B\u5E8F\u914D\u7F6E
 #wxpay.appId = wxba517a9bac38fe92
-wxpay.appId = wx033c30e366eff6ac
 #wxpay.appSecret = 8bfcce86abc4e2a461ecc781a09249a5
-wxpay.appSecret = e46a9a5947380fb70a1aa33a5b427ba4
+# \u8D22\u5229\u5B9D
+#wxpay.appId = wx033c30e366eff6ac
+#wxpay.appSecret = e46a9a5947380fb70a1aa33a5b427ba4
+# \u6765\u4E2A\u6CB9\u6167
+wxpay.appId = wxd8014eaf9bd72e93
+wxpay.appSecret = 0194125b13cece10d5f6cdd664847b55
 wxpay.mchId=1636980812
 wxpay.apiV2=34354320201030y323e432342343
 wxpay.certPath=/usr/local/fuint/cert/apiclient_cert.p12

gasStation-uni/manifest.json

@@ -50,7 +50,7 @@
     /* 小程序特有相关 */
     "mp-weixin" : {
         "output-path" : "dist/myapp",
-        "appid" : "wx033c30e366eff6ac",
+        "appid" : "wxd8014eaf9bd72e93",
         "setting" : {
             "urlCheck" : false,
             "es6" : true,

gasStation-uni/pagesLogin/login/login.vue

@@ -73,7 +73,7 @@
 										userInfo: {
 											storeId: 0,
 											staffId: "",
-											phone: '18475962147'
+											phone: '15426845715'
 										},
 
 										type: 'phone',

gasStation-uni/pagesMy/myorder/myorder.vue

@@ -26,7 +26,7 @@
 			<view>
 				<scroll-view scroll-y="true" :scroll-top="scrollTop" id="scrollList" style="height: 78vh;"
 					@scrolltolower="scrolltolower">
-					<!-- 列表 -->
+					<!-- 油品订单列表 -->
 					<view class="box-order" v-for="(item,index) in list" :key="index">
 						<view class="or-box-top">
 							<view class="">{{getStoreName(storeList,item.storeId)}}</view>
@@ -52,6 +52,32 @@
 							</view>
 						</view>
 					</view>
+					<!-- 储值卡订单列表 -->
+					<view class="box-order" v-for="(item,index) in balanceList" :key="index">
+						<view class="or-box-top">
+							<view class="">{{getStoreName(storeList,item.storeId)}}</view>
+							<view class="chengg">{{getPayName(payList,item.orderStatus)}}</view>
+						</view>
+
+						<view class="but-box">
+							<view class="huis">订单金额</view>
+							<view class="">￥{{item.orderAmount}}</view>
+						</view>
+						<view class="but-box">
+							<view class="huis">优惠合计</view>
+							<view class="reds">￥{{item.discountAmount}}</view>
+						</view>
+						<view class="but-box">
+							<view class="huis">订单时间</view>
+							<view class="" v-if="item.orderStatus=='paid'">{{parseTime(item.payTime)}}</view>
+							<view class="" v-else>{{item.createTime}}</view>
+						</view>
+						<view class="end-box" @click="goComment()">
+							<view class="anniu">
+								<text>评价有礼</text>
+							</view>
+						</view>
+					</view>
 					<!-- 状态：加载更多、没有更多了... -->
 					<u-load-more :status="status"></u-load-more>
 				</scroll-view>
@@ -84,6 +110,8 @@
 				// 订单列表信息
 				orderList: [],
 				list: [],
+				// 储值卡订单列表信息
+				balanceList:[],
 				map: {
 					page: 1,
 					pageSize: 5,