fea:kong

commit/order.js

@@ -205,7 +205,6 @@ export function confirmReceiptApi(id, data) {
  * @returns 
  */
 export function getPhpGlobalToken(data, merId) {
-    return ;
     return myRequestPhp({
         url: `${pre}mer/getPhpToken?${merId}`,
         method: 'POST',

commit/request.js

@@ -6,8 +6,8 @@ var baseURL = 'https://api.hxxfb.com/gateway/' // API访问的地址
  }else if(is==2){
 	 // baseURL = 'https://api.hebeiyhc.com/gateway/'; //生产环境
 	 // baseURL = 'https://api.hebeiyhc.com/gateway/'; //生产环境
-	//    baseURL = 'https://testapi.hxxfb.com/gateway/'; //预生产环境
-	   baseURL = '/gateway/'; //预生产环境
+	   baseURL = 'https://testapi.hxxfb.com/gateway/'; //预生产环境
+	//    baseURL = '/gateway/'; //预生产环境
 	
  }else{
 	  baseURL = 'https://api.hxxfb.com/gateway/'; //预生产环境

pages.json

@@ -6,7 +6,8 @@
         "path": "pages/cashier/index",
         "style": {
           // "navigationBarTitleText": "收银台"
-          "navigationStyle": "custom"
+          "navigationStyle": "custom",
+          "enablePullDownRefresh": true
         }
       },
       {

pages/cashier/index.vue

@@ -49,18 +49,18 @@
       </view>
     </view>
 
-	
-    <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" 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"
@@ -76,7 +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">
@@ -88,7 +88,7 @@
           </view>
         </view>
       </view>
-	  
+
       <view class="cashier-list-tbot">
         <view class="yis">
           <view class="sgjd">
@@ -118,12 +118,12 @@
 						消费分
 					</view>
 				</view> -->
-        <view class="yis">
+        <!-- <view class="yis">
           <view class="sgjd">
             {{ dataList.sun == undefined ? 0 : dataList.sun }}
           </view>
           <view class="sf"> 锁定会员数 </view>
-        </view>
+        </view> -->
         <view class="yis">
           <view class="sgjd">
             {{
@@ -138,6 +138,20 @@
           </view>
           <view class="sf"> 支付人数 </view>
         </view>
+        <view class="yis">
+          <view class="sgjd">
+            {{ dataList.jingdousum == undefined ? 0 : dataList.jingdousum }}
+          </view>
+          <view class="sf"> 京豆 </view>
+        </view>
+        <view class="yis">
+          <view class="sgjd">
+            {{
+              dataList.gongxianSumsum == undefined ? 0 : dataList.gongxianSumsum
+            }}
+          </view>
+          <view class="sf"> 贡献值 </view>
+        </view>
         <!-- 默认 -->
         <view class="yis">
           <view class="sgjd"> </view>
@@ -145,7 +159,8 @@
         </view>
       </view>
     </view>
-    <view
+    <latestRecords class="mt26" :records="records"></latestRecords>
+    <!-- <view
       class="cashier-jilu"
       :style="Number(zhuangi) != 7 ? 'margin-top:170rpx' : ''"
     >
@@ -176,7 +191,7 @@
           </view>
         </view>
       </view>
-    </view>
+    </view> -->
     <view
       class=""
       v-if="tihsi == 0"
@@ -193,10 +208,12 @@ import {
   selectMerchantOrder,
   payUserList,
   getZuorijinri,
-  getZuixinjilu
+  getZuixinjilu,
 } from "@/commit/shop.js";
-import readAppInfo,{getPhpToken} from "@/utils/readAppInfo.js";
+import readAppInfo, { getPhpToken } from "@/utils/readAppInfo.js";
+import latestRecords from "./latestRecords.vue";
 export default {
+  components: { latestRecords },
   data() {
     return {
       is_panudn: true,
@@ -210,6 +227,7 @@ export default {
       dataList: [], //今日昨日收益
       page: 1, //默认1页
       limit: 10, //默认10条数据
+      records: [], //最新记录
       items: [
         {
           name: "今日",
@@ -221,8 +239,8 @@ export default {
       List: [], //列表数据
       tihsi: "",
       zhuangi: "",
-	  gongxian: 0,
-	  jingdou: 0
+      gongxian: 0,
+      jingdou: 0,
     };
   },
   async onLoad() {
@@ -233,12 +251,13 @@ export default {
     this.end_time = this.$time.dateFormat("yyyy-MM-dd", daySart);
     let selectmerchant = uni.getStorageSync("selectmerchant");
 
-
-  let authorization = uni.getStorageSync("authorization");
+    let authorization = uni.getStorageSync("authorization");
     let userinfo = uni.getStorageSync("userinfo");
-	    this.mer_id = selectmerchant.merId;
+    this.mer_id = selectmerchant.merId;
     let jurisdiction = uni.getStorageSync("jurisdiction");
-     await getPhpToken()
+    if (this.mer_id > 0) {
+      await getPhpToken();
+    }
     if (jurisdiction) {
       jurisdiction.forEach((res, index) => {
         if (res == 7) {
@@ -265,8 +284,8 @@ export default {
         });
         this.selectMerchant();
         this.selectMerchantOrder();
-		this.getZuorijinri();
-		this.getZuixinjilu();
+        this.getZuorijinri();
+        this.getZuixinjilu();
         this.payUserList();
         return;
       } else if (
@@ -293,9 +312,6 @@ export default {
         url: "/pages/user/login/index",
       });
     }
-
-
-
   },
   onShow() {
     return;
@@ -370,6 +386,7 @@ export default {
     this.page = 1;
     this.is_panudn = true;
     this.List = [];
+    this.getZuixinjilu()
     this.payUserList();
     this.selectMerchant();
     this.selectMerchantOrder();
@@ -468,6 +485,7 @@ export default {
     },
     // 最新纪录列表
     payUserList() {
+      return
       payUserList({
         mer_id: this.mer_id,
         pageNum: this.page,
@@ -498,37 +516,59 @@ export default {
     },
     // 顶部统计
     getZuorijinri() {
-      getZuorijinri({
-      }).then(
+      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;
-			 }
+          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);
+          console.log(fail);
         }
       );
     },
-	// 最新纪录
-	getZuixinjilu() {
-	  getZuixinjilu({
+    // 最新纪录
+    getZuixinjilu() {
+      uni.showLoading({
+        title: "加载中",
+      });
+      getZuixinjilu({
         mer_id: this.mer_id,
         pageNum: this.page,
         pageSize: this.limit,
       }).then(
-	    (res) => {
-			console.log(res);
-	    },
-	    (fail) => {
-	      console.log(fail);
-	    }
-	  );
-	},
+        (res) => {
+          uni.stopPullDownRefresh();
+          console.log(res);
+          if (res.data.status == 200) {
+            // this.tihsi = res.data.data.count || 0;
+            this.tihsi = res.data.data.list.lenght || 0;
+            if (res.data.data.count > 0) {
+              if (this.page == 1) {
+                this.records = res.data.data.list;
+              } else {
+                this.records = this.records.concat(res.data.data.list);
+              }
+            } else {
+              if (this.page == 1) {
+                this.records = [];
+              }
+              this.is_panudn = false;
+            }
+            console.log(this.records,"recordsrecordsrecords")
+            uni.hideLoading();
+          }
+        },
+        (fail) => {
+          console.log(fail);
+          uni.hideLoading();
+        }
+      );
+    },
   },
 };
 </script>
@@ -539,6 +579,9 @@ page {
 </style>
 
 <style lang="scss" scoped>
+.mt26 {
+  margin-top: 26rpx;
+}
 .cashier-topin {
   width: 100%;
   height: 176rpx;

pages/cashier/latestRecords.vue

@@ -0,0 +1,117 @@
+<template>
+  <view class="record-container">
+    <view class="record-title">最新记录</view>
+    <view v-for="(item, index) in records" :key="index" class="record-item">
+      <view class="user-info">
+        <image class="user-avatar" :src="item.avatar" @error="handleError" v-if="item.avatar&&!isError"></image>
+        <image class="user-avatar" src="/static/images/new_ui/wutu.png" v-else></image>
+        <view class="user-details">
+          <view class="user-name">用户 {{ item.nickname }}</view>
+          <view class="user-id">ID:{{ item.out_trade_no }}</view>
+          <view class="consume-amount">消费金额 {{ item.money || "0.00" }}</view>
+        </view>
+      </view>
+      <view class="record-info">
+        <view class="record-time">{{ item.pay_time }}</view>
+        <view class="pv-info">pv: {{ item.pv }}</view>
+        <view v-for="(reward, rewardIndex) in rewards" :key="rewardIndex" class="reward-info">
+          获取 {{ reward.type=="jingdou"?item.jingdou||0 :item.gongxian ||0}} {{ reward.name }}
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+<script>
+
+export default {
+    props:{
+      records:{
+        type:Array,
+        default:()=>[]
+      }
+    },
+  data() {
+    return {
+        isError:false,
+         rewards: [
+            { type:"gongxian", name: '贡献值' },
+            { type:"jingdou", name: '京豆' }
+          ],
+    };
+  },
+  methods: {
+      handleError(e) {
+        this.isError = true;
+      }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.record-container {
+    width: calc(100% - 55rpx);
+  height: 100%;
+    background: #ffffff;
+    border-radius: 16rpx;
+}
+.record-title {
+  font-size: 36rpx;
+  font-weight: bold;
+  margin-bottom: 20rpx;
+  padding: 15rpx 25rpx;
+}
+.record-item {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  border-bottom: 1rpx solid #e0e0e0;
+  padding: 0 20rpx 20rpx 15rpx;
+  margin-bottom: 20rpx;
+  &:last-child{
+     border-bottom:none;
+  }
+}
+.user-info {
+  display: flex;
+  align-items: center;
+}
+.user-avatar {
+  width: 60rpx;
+  height: 60rpx;
+  border-radius: 50%;
+  margin-right: 20rpx;
+}
+.user-details {
+  display: flex;
+  flex-direction: column;
+}
+.user-name {
+  font-size: 32rpx;
+  margin-bottom: 10rpx;
+}
+.user-id {
+  font-size: 28rpx;
+  color: #999;
+  margin-bottom: 10rpx;
+}
+.consume-amount {
+  font-size: 28rpx;
+  background-color: #f0f9ff;
+  color: #1890ff;
+  padding: 6rpx 12rpx;
+  border-radius: 4rpx;
+}
+.record-info {
+  text-align: right;
+}
+.record-time {
+  font-size: 28rpx;
+  margin-bottom: 10rpx;
+}
+.pv-info {
+  font-size: 28rpx;
+  margin-bottom: 10rpx;
+}
+.reward-info {
+  font-size: 28rpx;
+}
+</style>

pages/user/login/index.vue

@@ -385,7 +385,7 @@ export default {
                       if (data.data.status == 200) {
                         uni.setStorageSync("selectmerchant", data.data.data);
                         let storeStaff = uni.getStorageSync("storeStaff");
-						 getPhpToken()
+						//  getPhpToken()
                         if (storeStaff != null) {
                           queryStoreBranch({
                             id: storeStaff.department

utils/readAppInfo.js

@@ -4,12 +4,16 @@ import {
   getImUser
 } from "@/commit/api.js";
 import {
-	getPhpGlobalToken
+  getPhpGlobalToken
 } from "@/commit/order.js";
-import { emConnect } from "@/EaseIM/emApis";
+import {
+  emConnect
+} from "@/EaseIM/emApis";
 import loginStore from "@/store/modules/login.js";
 
-const { loginWithPassword } = emConnect();
+const {
+  loginWithPassword
+} = emConnect();
 
 const setEMUserLoginInfosToStorage = (userId, token) => {
   const params = {
@@ -203,7 +207,9 @@ const func = async () => {
 
     uni.setStorageSync("selectmerchant", data.data.data);
 
-    const { merchantIntention = {} } = userInfoData.data.data || {};
+    const {
+      merchantIntention = {}
+    } = userInfoData.data.data || {};
 
     uni.setStorage({
       key: "myUsername",
@@ -221,7 +227,9 @@ const func = async () => {
         mer_id: uni.getStorageSync("mer_id")
       });
       // actionEMReconnect();
-      const { loginWithPassword } = emConnect();
+      const {
+        loginWithPassword
+      } = emConnect();
       uni.setStorage({
         key: "im_userid",
         data: imUserData.data.data.im_userid
@@ -249,15 +257,17 @@ const func = async () => {
 };
 export default func;
 
-export async function getPhpToken() {
+export async function getPhpToken(merId) {
   let phpToken = uni.getStorageSync("phpToken");
   let selectmerchant = uni.getStorageSync("selectmerchant");
-  if (!phpToken && selectmerchant) {
-
+  // console.log("phpToken", phpToken);
+  // console.log("selectmerchant", selectmerchant);
+  if (!phpToken && (selectmerchant && selectmerchant.merId > 0) || merId > 0) {
+     const merIdS = merId || selectmerchant.merId || ""
     try {
       const res = await getPhpGlobalToken({
-      	merId: selectmerchant.merId || ""
-      }, merId)
+        merId: merIdS
+      }, merIdS)
       if (res.data.status == 200) {
         const token = res.data.data.token || "";
         uni.setStorageSync("phpToken", token);
@@ -266,4 +276,4 @@ export async function getPhpToken() {
       }
     } catch (error) {}
   }
-}
+}