收银台调整

commit/shop.js

@@ -1,8 +1,11 @@
 import { 
  myRequest 
 } from './request.js'
+import {
+    myRequestPhp
+} from './requestPhp.js'
 // 店铺信息头
-export function selectMerchant(data) { 
+export function selectMerchant(data) { 	
  return myRequest({ 
   url: 'merchant_service/cashierService/selectMerchant', 
   method: 'post', 
@@ -57,3 +60,27 @@ export function queryByKey(data) {
   data 
  }) 
 } 
+
+
+const pre = ""
+const apiType = "php"
+
+//顶部统计
+export function getZuorijinri(data) {
+    return myRequestPhp({
+        url: `${pre}mer/statistics/zuorijinri`,
+        method: 'GET',
+        data,
+        apiType
+    })
+}
+
+// 最新记录
+export function getZuixinjilu(data) {
+    return myRequestPhp({
+        url: `${pre}mer/statistics/zuixinjilu`,
+        method: 'GET',
+        data,
+        apiType
+    })
+}

pages/cashier/index.vue

@@ -48,8 +48,19 @@
         </view>
       </view>
     </view>
-    <view class="cashier-list" v-if="Number(zhuangi) != 7 ? false : true">
+
+	
+    <view class="cashier-list" v-if="Number(zhuangi) != 7 ? false : true">	
+		<view class="cashier-list-top">
+		   <view class="cashier-jilu-top" style="font-weight: bold;"> 总贡献值: {{gongxian || 0}} </view>
+			<view class="cashier-jilu-top" style="font-weight: bold;"> 总京豆: {{jingdou  || 0}} </view>
+		</view>
+		<view class="cashier-list-top"></view>
+		
+		
+		
       <view class="cashier-list-top">
+		  
         <view class="cashier-list-top-left">
           <view
             class="yi"
@@ -65,6 +76,7 @@
             </view>
           </view>
         </view>
+		
         <view class="cashier-list-top-right" @click="peratingt">
           <view class="cashier-list-top-right-text"> 经营报表 </view>
           <view class="cashier-list-top-right-icon">
@@ -76,6 +88,7 @@
           </view>
         </view>
       </view>
+	  
       <view class="cashier-list-tbot">
         <view class="yis">
           <view class="sgjd">
@@ -179,6 +192,8 @@ import {
   selectMerchant,
   selectMerchantOrder,
   payUserList,
+  getZuorijinri,
+  getZuixinjilu
 } from "@/commit/shop.js";
 import readAppInfo,{getPhpToken} from "@/utils/readAppInfo.js";
 export default {
@@ -206,6 +221,8 @@ export default {
       List: [], //列表数据
       tihsi: "",
       zhuangi: "",
+	  gongxian: 0,
+	  jingdou: 0
     };
   },
   async onLoad() {
@@ -248,6 +265,8 @@ export default {
         });
         this.selectMerchant();
         this.selectMerchantOrder();
+		this.getZuorijinri();
+		this.getZuixinjilu();
         this.payUserList();
         return;
       } else if (
@@ -477,6 +496,39 @@ export default {
         }
       );
     },
+    // 顶部统计
+    getZuorijinri() {
+      getZuorijinri({
+      }).then(
+        (res) => {
+			console.log('顶部统计');
+			console.log(res.data);
+			console.log(res.data.data.list.gongxian);
+			 if (res.data.status == 200) {
+				 this.gongxian = res.data.data.list.gongxian;
+				 this.jingdou = res.data.data.list.jingdou;
+			 }
+        },
+        (fail) => {
+			console.log(fail);
+        }
+      );
+    },
+	// 最新纪录
+	getZuixinjilu() {
+	  getZuixinjilu({
+        mer_id: this.mer_id,
+        pageNum: this.page,
+        pageSize: this.limit,
+      }).then(
+	    (res) => {
+			console.log(res);
+	    },
+	    (fail) => {
+	      console.log(fail);
+	    }
+	  );
+	},
   },
 };
 </script>
@@ -636,7 +688,7 @@ page {
 
   .cashier-list {
     width: 686rpx;
-    height: 365rpx;
+    height: 400rpx;
     background-color: #ffffff;
     margin-top: 206rpx;
     border-radius: 16rpx;