diff --git a/fuintBackend/configure/dev/application.properties b/fuintBackend/configure/dev/application.properties index 7059da666..55db77eed 100644 --- a/fuintBackend/configure/dev/application.properties +++ b/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 diff --git a/gasStation-uni/manifest.json b/gasStation-uni/manifest.json index 4be5e7309..045488d30 100644 --- a/gasStation-uni/manifest.json +++ b/gasStation-uni/manifest.json @@ -50,7 +50,7 @@ /* 小程序特有相关 */ "mp-weixin" : { "output-path" : "dist/myapp", - "appid" : "wx033c30e366eff6ac", + "appid" : "wxd8014eaf9bd72e93", "setting" : { "urlCheck" : false, "es6" : true, diff --git a/gasStation-uni/pagesLogin/login/login.vue b/gasStation-uni/pagesLogin/login/login.vue index efd2c6aa8..b66ab36e5 100644 --- a/gasStation-uni/pagesLogin/login/login.vue +++ b/gasStation-uni/pagesLogin/login/login.vue @@ -73,7 +73,7 @@ userInfo: { storeId: 0, staffId: "", - phone: '18475962147' + phone: '15426845715' }, type: 'phone', diff --git a/gasStation-uni/pagesMy/myorder/myorder.vue b/gasStation-uni/pagesMy/myorder/myorder.vue index 859ab8d68..136d2019d 100644 --- a/gasStation-uni/pagesMy/myorder/myorder.vue +++ b/gasStation-uni/pagesMy/myorder/myorder.vue @@ -26,7 +26,7 @@ - + {{getStoreName(storeList,item.storeId)}} @@ -52,6 +52,32 @@ + + + + {{getStoreName(storeList,item.storeId)}} + {{getPayName(payList,item.orderStatus)}} + + + + 订单金额 + ¥{{item.orderAmount}} + + + 优惠合计 + ¥{{item.discountAmount}} + + + 订单时间 + {{parseTime(item.payTime)}} + {{item.createTime}} + + + + 评价有礼 + + + @@ -84,6 +110,8 @@ // 订单列表信息 orderList: [], list: [], + // 储值卡订单列表信息 + balanceList:[], map: { page: 1, pageSize: 5,