diff --git a/App.uvue b/App.uvue index 3972e50..a4d768e 100644 --- a/App.uvue +++ b/App.uvue @@ -10,9 +10,12 @@ dealerAddress:'', pid:'', pid_1:'', + orderCount:'', certFront:'', carPic:'', certBack:'', + id:'', + flag:0, onLaunch: function () { console.log('App Launch') }, diff --git a/api.uts b/api.uts index 6031401..e563867 100644 --- a/api.uts +++ b/api.uts @@ -119,3 +119,25 @@ export const getList = () => { export const childList = (id) => { return request(`/contract/miniapp/car/childList`, 'GET',id) } + + + +export const queryAppOrderCarByMainId = (id) => { + return request(`/contract/miniapp/order/queryAppOrderCarByMainId`, 'GET',id) +} + + + +export const queryDictItemsByCode = (id) => { + return request(`/contract/miniapp/dict/queryDictItemsByCode`, 'GET',id) +} + + +export const queryAppOrderFinanceByMainId = (id) => { + return request(`/contract/miniapp/order/queryAppOrderFinanceByMainId`, 'GET',id) +} + + +export const queryAppOrderVoucherByMainId = (id) => { + return request(`/contract/miniapp/order/queryAppOrderVoucherByMainId`, 'GET',id) +} \ No newline at end of file diff --git a/pages.json b/pages.json index 2570795..6210c5b 100644 --- a/pages.json +++ b/pages.json @@ -9,7 +9,7 @@ "app-plus": { "titleNView":false, "scrollIndicator":"none", - "softinputMode": "adjustResize" + "softinputMode": "adjustPan" } } }, @@ -21,7 +21,7 @@ "app-plus": { "titleNView":false, "scrollIndicator":"none", - "softinputMode": "adjustResize" + "softinputMode": "adjustPan" } }, "needLogin": true @@ -34,7 +34,7 @@ "app-plus": { "titleNView":false, "scrollIndicator":"none", - "softinputMode": "adjustResize" + "softinputMode": "adjustPan" } }, "needLogin": true @@ -47,7 +47,7 @@ "app-plus": { "titleNView":false, "scrollIndicator":"none", - "softinputMode": "adjustResize" + "softinputMode": "adjustPan" } }, "needLogin": true @@ -70,11 +70,39 @@ "app-plus": { "titleNView":false, "scrollIndicator":"none", - "softinputMode": "adjustResize" + "softinputMode": "adjustPan" } }, "needLogin": true }, + { + "path" : "pages/index/PayPal_pinpai", + "style" : + { + "navigationBarTitleText" : "", + "navigationStyle":"custom", + "app-plus": { + "titleNView":false, + "scrollIndicator":"none", + "softinputMode": "adjustPan" + } + }, + "needLogin": true + }, + { + "path" : "pages/index/PayPal_xq", + "style" : + { + "navigationBarTitleText" : "", + "navigationStyle":"custom", + "app-plus": { + "titleNView":false, + "scrollIndicator":"none", + "softinputMode": "adjustPan" + } + }, + "needLogin": true + }, { "path" : "pages/views/carOne", "style" : @@ -101,6 +129,15 @@ "navigationStyle":"custom" }, "needLogin": true + }, + { + "path" : "pages/views/carFinal", + "style" : + { + "navigationBarTitleText" : "", + "navigationStyle":"custom" + }, + "needLogin": true } ], "globalStyle": { diff --git a/pages/home/home.uvue b/pages/home/home.uvue index 2e86c3a..d10e4b8 100644 --- a/pages/home/home.uvue +++ b/pages/home/home.uvue @@ -17,15 +17,20 @@ - - {{orderCount}} - 本月订单 + 总订单 + 本月订单 : {{orderCount}} + 销售额:{{totalMoney}} - - {{totalMoney}} - 销售额 + + + + + {{item.productType}} + + 本月订单 : {{item.orderCount}} + 销售额:{{item.totalMoney}} @@ -68,6 +73,7 @@ export default { isshow_1:false, newListData:[], textcontent: [], + orderTypeCount:[], orderCount:0, totalMoney:0 }; @@ -83,9 +89,10 @@ export default { } ); statistics().then((res)=>{ - console.log('res',res) - this.orderCount = res.result[0].orderCount - this.totalMoney = res.result[0].totalMoney + console.log(res.result); + this.orderCount = res.result.orderCount + this.totalMoney = res.result.totalMoney + this.orderTypeCount = res.result.orderTypeCount }) }, methods: { @@ -161,7 +168,7 @@ export default { display: flex; flex-direction: row; align-items: center; - margin-top: 10%; + margin-top: 5%; } .order_Entry_image{ width: 10%; @@ -333,9 +340,9 @@ export default { flex-direction: row; width: 100%; height: 10%; - margin-top: 5%; align-items: center; justify-content: center; + /* background-image: linear-gradient(120deg, #e0c3fc 0%, #8ec5fc 100%); */ } .sales_left{ /* background-color: red ; */ @@ -344,20 +351,12 @@ export default { display: flex; align-items: center; justify-content: center; - + /* flex: 1; */ + margin: 1rem 2rem 1rem 1rem; } .sales_left text{ - font-size: 1rem; - } -.sales_right{ - /* background-color: red ; */ - width: 25%; - height: 100%; - display: flex; - align-items: center; - justify-content: center; -} - .sales_right text{ - font-size: 1rem; + font-size: 0.7rem; + } + \ No newline at end of file diff --git a/pages/index/PayPal.uvue b/pages/index/PayPal.uvue index f5da8af..edbdd91 100644 --- a/pages/index/PayPal.uvue +++ b/pages/index/PayPal.uvue @@ -5,7 +5,7 @@ - 付款信息 + 信息录入 @@ -75,22 +75,22 @@ * 客户姓名 - +