From 1662622ce7b81ff40cf277adaf75bd80f40d53bf Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Tue, 22 Oct 2024 14:55:29 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BB=A5=E5=8F=8A=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=98=BE=E7=A4=BA=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=E5=85=A8=E9=83=A8=E6=94=B9=E4=B8=BA=E6=80=BB=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesOrder/detail/components/list.vue     | 13 +++++++++++--
 pagesOrder/index/compoents/order-item.vue |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/pagesOrder/detail/components/list.vue b/pagesOrder/detail/components/list.vue
index 3d43056..38b85a3 100644
--- a/pagesOrder/detail/components/list.vue
+++ b/pagesOrder/detail/components/list.vue
@@ -40,7 +40,13 @@
 										<view class="line-th color-666 ">￥{{item.salePrice||item.price}}</view>
 									</template>
 									<template v-else>
-										<view>￥{{item.salePrice||item.price}}</view>
+										<template v-if="item.priceAmount<=0">
+											<view>￥0.00</view>
+											<view class="line-th color-666 ">￥{{returnTotalMoney(item)}}</view>
+										</template>
+										<template v-else>
+											<view>￥{{item.priceAmount}}</view>
+										</template>
 									</template>
 									<view class="u-m-t-22 color-999 u-font-24">X{{item.number||item.num}}</view>
 								</view>
@@ -130,6 +136,9 @@
 	import color from '@/commons/color.js'
 	const emits = defineEmits(['tuicai', 'tuikuan', 'printOrder'])
 	
+	function returnTotalMoney(item){
+		return (item.price*item.num).toFixed(2)
+	}
 	function to2(n){
 		if(!n){
 			return 0
@@ -175,7 +184,7 @@
 		const goodsPrice = props.data.reduce((prve, cur) => {
 			const curTotal = cur.info.filter(v => v.isGift !== "true" && v.status !== "return").reduce((a,
 				b) => {
-				return a + (b.salePrice || b.price) * (b.number || b.num)
+				return a + b.priceAmount*1
 			}, 0)
 			return prve + curTotal
 		}, 0)
diff --git a/pagesOrder/index/compoents/order-item.vue b/pagesOrder/index/compoents/order-item.vue
index c9dcd6d..5a8bc8c 100644
--- a/pagesOrder/index/compoents/order-item.vue
+++ b/pagesOrder/index/compoents/order-item.vue
@@ -40,7 +40,7 @@
 						</view>
 						<view class="u-flex u-flex-1 u-row-right">
 							<view>×{{item.num}}</view>
-							<view class="u-text-right" :style="computedPriceStyle()">￥{{item.price}}</view>
+							<view class="u-text-right" :style="computedPriceStyle()">￥{{item.priceAmount}}</view>
 						</view>
 					</view>
 				</view>

From 076fa01fef9e8a4d357c2c5c89e0dfb849cf5337 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 23 Oct 2024 13:49:57 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E9=80=80=E8=8F=9C=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A8=E5=87=BA=E7=99=BB=E5=BD=95=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue                  |  2 +-
 pages/login/index.vue                  |  3 +++
 pagesCreateOrder/index/index.vue       |  2 --
 pagesOrder/detail/components/extra.vue |  2 +-
 pagesOrder/detail/components/list.vue  | 20 ++++++++++++++------
 static/indexImg/icon-login-out.svg     |  1 +
 6 files changed, 20 insertions(+), 10 deletions(-)
 create mode 100644 static/indexImg/icon-login-out.svg

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 2673ea5..dde1183 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -229,7 +229,7 @@
 		
 		{
 			title: '退出登录',
-			icon: '/static/indexImg/PAGE_SALES_SUMMARY.svg',
+			icon: '/static/indexImg/icon-login-out.svg',
 			pageUrl: 'PAGES_LOGIN',
 			clickFunc:()=>{
 				storageManage.cleanByLogout()
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 1db82fe..6f9bd90 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -254,6 +254,9 @@
 		if(e==1){
 			vdata.formData.merchantName = '18049104914'
 			vdata.formData.username = '13666666666'
+			vdata.formData.pwd = '123456'
+		}else{
+			vdata.formData.pwd = 'qwer1234'
 		}
 		// #endif
 	}
diff --git a/pagesCreateOrder/index/index.vue b/pagesCreateOrder/index/index.vue
index a4c3aac..1f4eaef 100644
--- a/pagesCreateOrder/index/index.vue
+++ b/pagesCreateOrder/index/index.vue
@@ -158,7 +158,6 @@
 		reactive,
 		ref,
 		nextTick,
-		getCurrentInstance,
 		watch
 	} from 'vue';
 	import myCar from './components/car'
@@ -179,7 +178,6 @@
 		canXiadan.value=await hasPermission('允许下单')
 	}
 	xiadanClick()
-	const instance = getCurrentInstance();
 	//临时菜
 	const lingshi = reactive({
 		show: false
diff --git a/pagesOrder/detail/components/extra.vue b/pagesOrder/detail/components/extra.vue
index 0032d6b..7393980 100644
--- a/pagesOrder/detail/components/extra.vue
+++ b/pagesOrder/detail/components/extra.vue
@@ -5,7 +5,7 @@
 			<template v-if="orderInfo.status=='unpaid'&&data.status!='return'">
 				<my-button plain shape="circle" :width="160" :height="56" @click="tuicai">退菜</my-button>
 			</template>
-			<template v-if="orderInfo.status=='closed'">
+			<template v-if="orderInfo.status=='closed'&&data.status!='return'">
 				<my-button plain shape="circle" :width="160" :height="56"  @click="tuikuan">退款</my-button>
 			</template>
 		</view>
diff --git a/pagesOrder/detail/components/list.vue b/pagesOrder/detail/components/list.vue
index 38b85a3..a18357e 100644
--- a/pagesOrder/detail/components/list.vue
+++ b/pagesOrder/detail/components/list.vue
@@ -60,12 +60,15 @@
 								@tap="tuicai(item,index)"><text class="no-wrap">退菜</text></my-button>
 						</view>
 					</template>
-					<template v-if="orderInfo.status=='closed'">
-						<view class="u-flex u-row-right gap-20 u-m-t-20" v-if="item.status!='return'">
-							<my-button :width="128" :height="48" plain shape="circle"
-								@tap="tuikuan(item,index)"><text class="no-wrap">退款</text> </my-button>
-						</view>
+					<template v-if="item.status!='refund'">
+						<template v-if="orderInfo.status=='closed'||orderInfo.status=='refund'">
+							<view class="u-flex u-row-right gap-20 u-m-t-20" v-if="item.status!='return'">
+								<my-button :width="128" :height="48" plain shape="circle"
+									@tap="tuikuan(item,index)"><text class="no-wrap">退款</text> </my-button>
+							</view>
+						</template>
 					</template>
+					
 				</view>
 			</view>
 			<!-- <view class="bg-gray u-p-20 u-m-t-20" v-if="orderInfo.remark">
@@ -134,6 +137,7 @@
 		computed
 	} from 'vue';
 	import color from '@/commons/color.js'
+	import {hasPermission} from '@/commons/utils/hasPermission.js'
 	const emits = defineEmits(['tuicai', 'tuikuan', 'printOrder'])
 	
 	function returnTotalMoney(item){
@@ -151,7 +155,11 @@
 	}
 
 	function tuikuan(item, index) {
-		emits('tuikuan', item, index)
+		hasPermission('允许退款').then(res=>{
+			if(res){
+				emits('tuikuan', item, index)
+			}
+		})
 	}
 
 	function printOrder() {
diff --git a/static/indexImg/icon-login-out.svg b/static/indexImg/icon-login-out.svg
new file mode 100644
index 0000000..c78be7f
--- /dev/null
+++ b/static/indexImg/icon-login-out.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1729662523365" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4294" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M512 493.568c-32.256 0-58.88-26.112-58.88-58.88V58.88C453.12 26.112 479.744 0 512 0s58.88 26.112 58.88 58.88v375.808c0 32.256-26.624 58.88-58.88 58.88z" fill="#318AFE" p-id="4295"></path><path d="M512 1024c-273.92 0-496.64-222.72-496.64-496.64 0-202.752 121.344-382.976 309.248-459.776 30.208-12.288 64.512 2.048 76.8 32.256 12.288 30.208-2.048 64.512-32.256 76.8C225.792 235.008 133.12 372.736 133.12 527.36c0 208.896 169.984 378.88 378.88 378.88s378.88-169.984 378.88-378.88c0-154.624-92.672-292.352-236.032-351.232-30.208-12.288-44.544-46.592-32.256-76.8 12.288-30.208 46.592-44.544 76.8-32.256 187.904 76.8 309.248 257.024 309.248 459.776 0 274.432-222.72 497.152-496.64 497.152z" fill="#318AFE" p-id="4296"></path></svg>
\ No newline at end of file

From 48c01df8d0997db7614e3afcd74197f8bf6d1269 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 23 Oct 2024 14:27:00 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8C=85apk?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json | 30 +++++++++++++++---------------
 开发文档.md   |  2 ++
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/manifest.json b/manifest.json
index 064baed..ae45d73 100644
--- a/manifest.json
+++ b/manifest.json
@@ -150,12 +150,12 @@
         "unipush" : {
             "enable" : true
         },
-        "plugins" : {
-            "WechatSI" : {
-                "version" : "0.3.5",
-                "provider" : "wx069ba97219f66d99"
-            }
-        },
+        // "plugins" : {
+        //     "WechatSI" : {
+        //         "version" : "0.3.5",
+        //         "provider" : "wx069ba97219f66d99"
+        //     }
+        // },
         "requiredBackgroundModes" : [ "audio", "location" ],
         "__usePrivacyCheck__" : true,
         "libVersion" : "latest"
@@ -213,15 +213,15 @@
                         "/ysk" : ""
                     }
                 },
-				"/yufabu" : {
-				    // 需要被代理的后台地址
-				    "target" : "https://pre-cashier.sxczgkj.cn",
-				    "changeOrigin" : true,
-				    "secure" : false,
-				    "pathRewrite" : {
-				        "/yufabu" : ""
-				    }
-				},
+                "/yufabu" : {
+                    // 需要被代理的后台地址
+                    "target" : "https://pre-cashier.sxczgkj.cn",
+                    "changeOrigin" : true,
+                    "secure" : false,
+                    "pathRewrite" : {
+                        "/yufabu" : ""
+                    }
+                },
                 "/ww" : {
                     // 需要被代理的后台地址
                     "target" : "http://192.168.1.15:8000",
diff --git a/开发文档.md b/开发文档.md
index 93596f1..e5e608d 100644
--- a/开发文档.md
+++ b/开发文档.md
@@ -6,6 +6,8 @@
 发布APP:     HBuilderX 3.6.5 ( 3.6.11 app调试报错 )
 H5, 不影响。 
 
+###apk下载地址
+* <https://mp-3b7dba1a-2dfb-4c7a-a239-2ab2157f829a.cdn.bspapp.com/cloudstorage/__UNI__66E7BD0_20241023141536.apk>
 
 ### 全局文件结构
 * commons->utils>hasPermission.js 全局权限验证文件

From 0e05b3ea5ac50edcba3c0edb27ee79601381eac4 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Wed, 23 Oct 2024 15:11:27 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E8=80=97=E6=9D=90=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 commons/utils/hasPermission.js                |   4 +-
 .../JeepayNavigation/JeepayNavigation.vue     |   7 +-
 pageConsumables/addConsumables.vue            |  25 +-
 pageConsumables/addType.vue                   |   8 +-
 pageConsumables/bg.png                        | Bin 0 -> 9189 bytes
 pageConsumables/editConsumables.vue           |   8 +-
 pageConsumables/index.vue                     |  80 ++--
 pageConsumables/inventoryCheck.vue            |   9 +-
 pageConsumables/outbound.vue                  |   8 +-
 pageConsumables/viewrecords.vue               |  10 +-
 pageConsumables/warehouseEntry.vue            |  23 +-
 pageUser/index/components/user.vue            |  20 +-
 pageUser/index/index.vue                      |  57 ++-
 pages/index/components/Stats.vue              | 400 ++++++++++--------
 14 files changed, 413 insertions(+), 246 deletions(-)
 create mode 100644 pageConsumables/bg.png

diff --git a/commons/utils/hasPermission.js b/commons/utils/hasPermission.js
index 39e9476..960feaa 100644
--- a/commons/utils/hasPermission.js
+++ b/commons/utils/hasPermission.js
@@ -59,8 +59,8 @@ const $PermissionObj = {
 			key: 'yun_xu_guan_li_hui_yuan_xin_xi'
 		},
 		{
-			text: 'yun_xu_xiu_gai_hui_yuan_yu_e',
-			key: '允许修改会员余额'
+			key: 'yun_xu_xiu_gai_hui_yuan_yu_e',
+			text: '允许修改会员余额'
 		}
 	],
 	stock:[
diff --git a/components/JeepayNavigation/JeepayNavigation.vue b/components/JeepayNavigation/JeepayNavigation.vue
index 8bb47ae..1b3647a 100644
--- a/components/JeepayNavigation/JeepayNavigation.vue
+++ b/components/JeepayNavigation/JeepayNavigation.vue
@@ -62,9 +62,10 @@ const props = defineProps({
 
 // 点击事件
 async function clickFunc(nav) {
-let res =await hasPermission('允许查看经营数据')
-console.log(res,'调试11111')
-if(!res) return
+	if(nav.pageUrl=="PAGES_SALES_SUMMARY"){
+		let res =await hasPermission('允许查看经营数据')
+		if(!res) return
+	}
   // 包含回调事件
   if (nav.clickFunc) {
     return nav.clickFunc(nav)
diff --git a/pageConsumables/addConsumables.vue b/pageConsumables/addConsumables.vue
index d160f63..a1ae66a 100644
--- a/pageConsumables/addConsumables.vue
+++ b/pageConsumables/addConsumables.vue
@@ -25,7 +25,7 @@
 					耗材价格
 				</view>
 				<view>
-					<input type="text" placeholder="请输入耗材价格" v-model="datas.form.price" name="" id="">
+					<input placeholder="请输入耗材价格" type="number" v-model="datas.form.price" name="" id="">
 				</view>
 			</li>
 			<li>
@@ -59,13 +59,16 @@
 		<up-button type="primary" style="background-color:  #318AFE;color: #fff;" @tap="sumbit" :plain="true"
 			text="保存"></up-button>
 	</view>
+	<!-- 消息提示 -->
+	<up-toast ref="uToastRef"></up-toast>
 </template>
 
 <script setup>
 	import {
 		reactive,
 		computed,
-		onMounted
+		onMounted,
+		getCurrentInstance
 	} from 'vue';
 	import {
 		tbConsTypeList,
@@ -107,13 +110,29 @@
 			})
 		})
 	}
+	const refs = getCurrentInstance()
 	let sumbit = () => {
+		if (!datas.form.conUnit) {
+			refs.ctx.$refs.uToastRef.show({
+				type: 'default',
+				message: "单位不能为空"
+			})
+			return
+		}
+		if (!datas.form.price) {
+			refs.ctx.$refs.uToastRef.show({
+				type: 'default',
+				message: "价格不能为空"
+			})
+			return
+		}
 		tbConsInfoAddlist([{
 			...datas.form,
 			shopId: uni.getStorageSync("shopId"),
 			conTypeId: datas.list[datas.nowStatusIndex].id
 		}]).then(res => {
-			go.to('PAGES_SALES_CONSUMABLES')
+			// go.to('PAGES_SALES_CONSUMABLES')
+			go.back()
 		})
 	}
 	const statusHeight = computed(() => {
diff --git a/pageConsumables/addType.vue b/pageConsumables/addType.vue
index b0e6104..2dcc2a8 100644
--- a/pageConsumables/addType.vue
+++ b/pageConsumables/addType.vue
@@ -6,7 +6,7 @@
 			</view>
 			<view class="">
 				是否启用
-				<up-switch checked="true" activeValue="1" inactiveValue="0" @change="switchChangeEvent($event,item)"
+				<up-switch checked="true" :activeValue="1" :inactiveValue="0" @change="switchChangeEvent($event,item)"
 					:modelValue="item.status" style="transform:scale(0.7)" />
 			</view>
 		</li>
@@ -126,13 +126,13 @@
 		})
 	}
 </script>
-
-<style scoped lang="less">
+<style>
 	page {
 		background-color: #f9f9f9;
 		padding: 0 28rpx;
 	}
-
+</style>
+<style scoped lang="less">
 	ul,
 	li {
 		list-style: none;
diff --git a/pageConsumables/bg.png b/pageConsumables/bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc247457fd962d78c54681a9b8fb7bec3a6f1038
GIT binary patch
literal 9189
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

literal 0
HcmV?d00001

diff --git a/pageConsumables/editConsumables.vue b/pageConsumables/editConsumables.vue
index 88476a6..0ac9360 100644
--- a/pageConsumables/editConsumables.vue
+++ b/pageConsumables/editConsumables.vue
@@ -114,7 +114,7 @@
 			conTypeId: datas.list[datas.nowStatusIndex].id,
 			id: datas.form.id
 		}]).then(res => {
-			go.to('PAGES_SALES_CONSUMABLES')
+			go.back()
 		})
 	}
 	const statusHeight = computed(() => {
@@ -126,11 +126,13 @@
 		datas.showStatus = false
 	}
 </script>
-
-<style scoped lang="less">
+<style>
 	page {
 		background-color: #f9f9f9;
 	}
+</style>
+<style scoped lang="less">
+ 
 
 	ul,
 	li {
diff --git a/pageConsumables/index.vue b/pageConsumables/index.vue
index aa185d6..9737784 100644
--- a/pageConsumables/index.vue
+++ b/pageConsumables/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="ConsumablesTop">
-		<view @tap="showStatus = !showStatus">
-			{{datas.title}}
+		<view @tap="showStatus = !showStatus" style="display: flex;align-items: center;">
+			{{datas.title}}<up-icon name="arrow-down"   size="12"></up-icon>
 		</view>
 		<view>
 			<input v-model="datas.conName" @input="inputEvent" type="text" placeholder="请输入耗材名称" />
@@ -20,7 +20,7 @@
 		<view :style="{height: '14px'}"></view>
 	</view>
 
-	<ul class="ConsumablesConent">
+	<ul class="ConsumablesConent" v-if="datas.list.length">
 		<li v-for="(item,index) in datas.list" :key="index">
 			<view>
 				{{item.conName}}
@@ -49,12 +49,18 @@
 					所属商品: {{ filtersSproductId(item.productId)}}
 				</view>
 				<view class="">
-					<up-button type="primary" color="#999" @tap="toUrl('PAGES_VIEWRECORDS',{item:JSON.stringify(item)})" :plain="true" text="查看记录"></up-button>
+					<up-button type="primary" color="#999" @tap="toUrl('PAGES_VIEWRECORDS',{item:JSON.stringify(item)})"
+						:plain="true" text="查看记录"></up-button>
 					<up-button type="primary" @click="toggle(item)" :plain="true" text="更多操作"></up-button>
 				</view>
 			</view>
 		</li>
+		<li style="background-color: rgba(0,0,0,0); height: 200rpx;"></li>
 	</ul>
+	<view v-else style="text-align: center;">
+		<image src="./bg.png" style="width: 325rpx;height: 335rpx;" mode=""></image>
+		<view style="font-size: 28rpx;color: #999;">暂无数据</view>
+	</view>
 	<view class="ConsumablesBottom">
 		<view @tap="toUrl('PAGES_ADD_CONSUMABLES')">
 			新增耗材
@@ -76,8 +82,13 @@
 		reactive,
 		computed
 	} from 'vue';
-	import {onShow} from '@dcloudio/uni-app'
+	import {
+		onShow
+	} from '@dcloudio/uni-app'
 	import go from '@/commons/utils/go.js';
+	import {
+		hasPermission
+	} from '@/commons/utils/hasPermission.js';
 	import {
 		viewConInfoFlowget,
 		tbConsType,
@@ -120,6 +131,7 @@
 		// 获取分类列表
 		gettbConsTypeList()
 	})
+
 	function changeNowStatusIndex(i) {
 		nowStatusIndex.value = i
 		showStatus.value = false
@@ -159,49 +171,69 @@
 		report.data.consId = d.id
 		actionSheet.active = d
 	}
-	
+
 	let sheetClick = (index) => {
 		if (index == 0) {
-			//打开报损弹窗
-			reportDamage.value.open(actionSheet.activeId);
-			report.data.name = actionSheet.active.conName
-			report.data.unit = actionSheet.active.conUnit
+			// 权限
+			hasPermission('允许提交报损').then(ele => {
+				if (ele) {
+					//打开报损弹窗
+					reportDamage.value.open(actionSheet.activeId);
+					report.data.name = actionSheet.active.conName
+					report.data.unit = actionSheet.active.conUnit
+				}
+			})
 		} else if (index == 1) {
 			toUrl('PAGES_EDIT_CONSUMABLES', {
 				item: JSON.stringify(actionSheet.active)
 			})
 		} else if (index == 2) {
-			toUrl('PAGES_SALES_INVENTORYCHECK', {
-				item: JSON.stringify(actionSheet.active)
+			hasPermission('允许耗材盘点').then(ele => {
+				if (ele) {
+					toUrl('PAGES_SALES_INVENTORYCHECK', {
+						item: JSON.stringify(actionSheet.active)
+					})
+				}
 			})
 		} else if (index == 3) {
-			console.log(actionSheet.activeId,'调试1')
-			toUrl('PAGES_SALES_WAREHOUSEENTRY', {
-				consId: actionSheet.activeId,
-				item: JSON.stringify(actionSheet.active)
+			hasPermission('允许耗材入库').then(ele => {
+				if (ele) {
+					toUrl('PAGES_SALES_WAREHOUSEENTRY', {
+						consId: actionSheet.activeId,
+						item: JSON.stringify(actionSheet.active)
+					})
+				}
 			})
 		} else if (index == 4) {
-			toUrl('PAGES_SALES_OUTBOUND', {
-				consId: actionSheet.activeId,
-				item: JSON.stringify(actionSheet.active)
+			hasPermission('允许耗材出库').then(ele => {
+				if (ele) {
+					toUrl('PAGES_SALES_OUTBOUND', {
+						consId: actionSheet.activeId,
+						item: JSON.stringify(actionSheet.active)
+					})
+				}
 			})
 		}
 	}
-
+	// async function viewpermission(d) {
+	// 	let res = await hasPermission(d)
+	// 	console.log(res,'调试1')
+	// 	return res
+	// }
 	async function getList(d = "") {
 		viewConInfoFlowget({
 			shopId: uni.getStorageSync("shopId"),
 			conName: datas.conName,
 			conTypeId: d,
-			size:100,
-			page:0
+			size: 100,
+			page: 0
 		}).then(res => {
 			datas.list = res.content
 		})
 	}
 
 	function inputEvent(d) {
-		datas.conName = d.detail.value
+		datas.conName =  d.detail.value.replace(/\s*/g,""); 
 		getList()
 	}
 
@@ -413,7 +445,7 @@
 		background-color: #fff;
 	}
 
-	
+
 	.df() {
 		display: flex;
 		align-items: center;
diff --git a/pageConsumables/inventoryCheck.vue b/pageConsumables/inventoryCheck.vue
index 1535e31..421df5a 100644
--- a/pageConsumables/inventoryCheck.vue
+++ b/pageConsumables/inventoryCheck.vue
@@ -100,7 +100,8 @@
 			conInfoId: datas.form.id,
 			lpNum: profitNumber._value
 		}).then(res => {
-			go.to('PAGES_SALES_CONSUMABLES')
+			// go.to('PAGES_SALES_CONSUMABLES')
+			go.back()
 		})
 	}
 	/**
@@ -129,11 +130,13 @@
 		showStatus.value = !showStatus.value
 	}
 </script>
-
-<style scoped lang="less">
+<style>
 	page {
 		background-color: #f9f9f9;
 	}
+</style>
+<style scoped lang="less">
+ 
 
 	.df() {
 		display: flex;
diff --git a/pageConsumables/outbound.vue b/pageConsumables/outbound.vue
index 9a622d1..0ba2120 100644
--- a/pageConsumables/outbound.vue
+++ b/pageConsumables/outbound.vue
@@ -185,7 +185,7 @@
 			supplierId: datas.list[nowStatusIndex.value].id,
 			accountsPayable: datas.form.list[0].stockNumber * datas.form.list[0].price,
 		}).then(res => {
-			go.to('PAGES_SALES_CONSUMABLES')
+			go.back()
 		})
 	}
 	// 获取供应商
@@ -193,11 +193,13 @@
 		return 30 * datas.status.length + 14 + 'px'
 	})
 </script>
-
-<style scoped lang="less">
+<style>
 	page {
 		background-color: #f9f9f9;
 	}
+</style>
+<style scoped lang="less">
+ 
 
 	.df() {
 		display: flex;
diff --git a/pageConsumables/viewrecords.vue b/pageConsumables/viewrecords.vue
index 5ad2dd8..4264764 100644
--- a/pageConsumables/viewrecords.vue
+++ b/pageConsumables/viewrecords.vue
@@ -49,6 +49,7 @@
 	})
 	onMounted(() => {
 		let items = JSON.parse(props.item)
+		console.log(items,'调试1')
 		getlist()
 	})
 	let getlist = () => {
@@ -56,17 +57,20 @@
 			page: 0,
 			shopId: uni.getStorageSync("shopId"),
 			size: 30,
-			sort: "createTime,desc"
+			sort: "createTime,desc",
+			conTypeId:JSON.parse(props.item).conTypeId
 		}).then(res => {
 			datas.list = res.content
 		})
 	}
 </script>
-
-<style scoped lang="less">
+<style>
 	page {
 		background-color: #f9f9f9;
 	}
+	
+</style>
+<style scoped lang="less">
 
 	ul,
 	li {
diff --git a/pageConsumables/warehouseEntry.vue b/pageConsumables/warehouseEntry.vue
index 612477e..75d270d 100644
--- a/pageConsumables/warehouseEntry.vue
+++ b/pageConsumables/warehouseEntry.vue
@@ -22,15 +22,15 @@
 					<text style="color: red;">*</text> 入库数量
 				</view>
 				<view>
-					<input type="text" placeholder="请输入数量" v-model="datas.form.list.stockNumber" name="" id="">
+					<input type="number" placeholder="请输入数量" v-model="datas.form.list.stockNumber" name="" id="">
 				</view>
 			</li>
 			<li>
 				<view>
-						<text style="color: red;">*</text>单价
+					<text style="color: red;">*</text>单价
 				</view>
 				<view>
-					<input type="text" placeholder="请输入单价(元)" v-model="datas.form.list.price" name="" id="">
+					<input type="number" placeholder="请输入单价(元)" v-model="datas.form.list.price" name="" id="">
 				</view>
 			</li>
 			<li>
@@ -132,6 +132,7 @@
 		datas.form = assign(datas.form, ...datas.item)
 	})
 	const refs = getCurrentInstance()
+
 	function toggle() {
 		go.to('PAGES_ADD_SUPPLIER')
 	}
@@ -167,7 +168,7 @@
 			})
 			return
 		}
-		if(!datas.form.list.price){
+		if (!datas.form.list.price) {
 			refs.ctx.$refs.uToastRef.show({
 				type: 'default',
 				message: "请输入必填项",
@@ -182,7 +183,13 @@
 			supplierId: datas.list[nowStatusIndex.value].id,
 			accountsPayable: datas.form.list[0].stockNumber * datas.form.list[0].price,
 		}).then(res => {
-			go.to('PAGES_SALES_CONSUMABLES')
+			refs.ctx.$refs.uToastRef.show({
+				type: 'default',
+				message: "保存成功",
+			})
+			setTimeout(() => {
+				go.back()
+			}, 1000)
 		})
 	}
 	// 获取供应商
@@ -191,12 +198,12 @@
 		return 30 * datas.status.length + 14 + 'px'
 	})
 </script>
-
-<style scoped lang="less">
+<style>
 	page {
 		background-color: #f9f9f9;
 	}
-
+</style>
+<style scoped lang="less">
 	.df() {
 		display: flex;
 		align-items: center;
diff --git a/pageUser/index/components/user.vue b/pageUser/index/components/user.vue
index 9996581..118c893 100644
--- a/pageUser/index/components/user.vue
+++ b/pageUser/index/components/user.vue
@@ -32,10 +32,28 @@
 					</view>
 				</view>
 			</view>
+			<view class="u-flex-1  u-text-center" @tap="toYue">
+				<view class="font-bold color-000 pr-16" >{{data.amount}}</view>
+				<view class="u-flex u-row-center" >
+					<view class="color-999">积分</view>
+					<view class="u-flex">
+						<uni-icons type="right" color="#999"></uni-icons>
+					</view>
+				</view>
+			</view>
+			<view class="u-flex-1  u-text-center" @tap="toYue">
+				<view class="font-bold color-000 pr-16" >{{data.amount}}</view>
+				<view class="u-flex u-row-center" >
+					<view class="color-999">优惠券</view>
+					<view class="u-flex">
+						<uni-icons type="right" color="#999"></uni-icons>
+					</view>
+				</view>
+			</view>
 			<view class="u-flex-1  u-text-center" @tap="toUser">
 				<view class="font-bold color-000 pr-16">{{data.totalScore}}</view>
 				<view class="u-flex u-row-center">
-					<view class="color-999">积分</view>
+					<view class="color-999">已消费</view>
 					<view class="u-flex">
 						<uni-icons type="right" color="#999"></uni-icons>
 					</view>
diff --git a/pageUser/index/index.vue b/pageUser/index/index.vue
index 398e85a..d5c355d 100644
--- a/pageUser/index/index.vue
+++ b/pageUser/index/index.vue
@@ -25,15 +25,15 @@
 					<view class="u-font-32">数据统计</view>
 					<view class="u-m-t-40  u-flex u-row-between">
 						<view class=" ">
-							<view>会员数</view>
+							<view>今日新增(人)</view>
 							<view class="u-m-t-10 u-font-36 font-bold">{{pageData.allShopInfo.userTotal}}</view>
 						</view>
 						<view class="line-l-r u-p-l-30 u-p-r-30">
-							<view>会员余额</view>
+							<view>总用户量(人)</view>
 							<view class="u-m-t-10 u-font-36 font-bold">{{pageData.allShopInfo.balanceTotal}}</view>
 						</view>
 						<view class="">
-							<view>充值金额</view>
+							<view>总余额(元)</view>
 							<view class="u-m-t-10 u-font-36 font-bold">{{pageData.allShopInfo.chageTotal}}</view>
 						</view>
 					</view>
@@ -47,6 +47,9 @@
 				</view>
 				<my-pagination @change="pageChange"></my-pagination>
 			</view>
+			<view class="fixed_b">
+				<my-button showShadow @tap="toAddUser" shape="circle">新建用户</my-button>
+			</view>
 		</template>
 
 		<!-- 导入用户 -->
@@ -83,7 +86,6 @@
 					</view>
 				</view>
 			</view>
-
 			<view class="fixed_b">
 				<my-button showShadow @tap="toAddUser" shape="circle">新建用户</my-button>
 			</view>
@@ -166,6 +168,9 @@
 	import infoBox from "@/commons/utils/infoBox.js"
 	import * as $Api from '@/http/yskApi/shop-user.js'
 	import API from '../../http/classApi';
+	import {
+		hasPermission
+	} from '@/commons/utils/hasPermission.js';
 	let tabsCurrent = ref(0)
 	const tabsList = ['用户列表', '导入用户']
 	const remarkModel = ref(null)
@@ -185,14 +190,37 @@
 
 	const goodsStockModel = ref(null)
 
-	const moreOperateList = ['增减余额', '增减积分', '设为会员', '赠送券', '查看详情']
+	const moreOperateList = ['增减余额', '增减积分', '修改信息', ]
 
 	function moreOperateClick() {
 		moreOperate.value.open()
 	}
 
 	function actionSheetClick(i) {
-		console.log(i);
+		if (i == 0) {
+			hasPermission('允许修改会员余额').then(ele => {
+				if (ele) {
+					toUrl('PAGES_SALES_WAREHOUSEENTRY', {
+						consId: actionSheet.activeId,
+						item: JSON.stringify(actionSheet.active)
+					})
+				}
+			})
+		} else if (i == 1) {
+			toUrl('PAGES_SALES_WAREHOUSEENTRY', {
+				consId: actionSheet.activeId,
+				item: JSON.stringify(actionSheet.active)
+			})
+		} else if (i == 2) {
+			hasPermission('允许管理会员信息').then(ele => {
+				if (ele) {
+					toUrl('PAGES_SALES_WAREHOUSEENTRY', {
+						consId: actionSheet.activeId,
+						item: JSON.stringify(actionSheet.active)
+					})
+				}
+			})
+		}
 	}
 
 	//修改备注弹窗展示
@@ -367,12 +395,16 @@
 	}
 </style>
 <style lang="scss" scoped>
-	.after-r,.after-l {
+	.after-r,
+	.after-l {
 		position: relative;
 	}
-	.line-l-r{
+
+	.line-l-r {
 		position: relative;
-		&::after,&:before{
+
+		&::after,
+		&:before {
 			position: absolute;
 			content: '';
 			top: 0;
@@ -381,13 +413,16 @@
 			border-radius: 2px;
 			background-color: rgba(255, 255, 255, .3);
 		}
-		&::after{
+
+		&::after {
 			right: 0;
 		}
-		&::before{
+
+		&::before {
 			left: 0;
 		}
 	}
+
 	.after-r::after {
 		position: absolute;
 		content: '';
diff --git a/pages/index/components/Stats.vue b/pages/index/components/Stats.vue
index 28e4dac..2e0fd34 100644
--- a/pages/index/components/Stats.vue
+++ b/pages/index/components/Stats.vue
@@ -3,7 +3,8 @@
 		<view class="index-selected">
 			<view class="index-time">
 				<block v-for="v in timeList" :key="v.value">
-					<view class="time-item flex-center" :class="{ 'time-active': vdata.timeSelected == v.value }" @tap.stop="changeTimeFunc(v.value)">
+					<view class="time-item flex-center" :class="{ 'time-active': vdata.timeSelected == v.value }"
+						@tap.stop="changeTimeFunc(v.value)">
 						{{ v.title }}
 					</view>
 				</block>
@@ -14,20 +15,20 @@
 		</view>
 		<view class="receipts-money">
 			<text class="money-title">成交金额 (元)</text>
-			<view class="money-num">{{ list.sale.incomeAmountAll||0}}</view>
+			<view class="money-num">{{ list?list.sale.incomeAmountAll:0}}</view>
 		</view>
 		<view class="money-list">
 			<view class="money-item">
 				<text class="money-title">消费笔数</text>
-				<view class="money-num">{{  list.vip.useNum||0 }}</view>
+				<view class="money-num">{{ list?list.vip.useNum:0 }}</view>
 			</view>
 			<view class="money-item">
 				<text class="money-title">退款金额 (元)</text>
-				<view class="money-num">{{ list.sale.outAmount||0}}</view>
+				<view class="money-num">{{ list?list.sale.outAmount:0}}</view>
 			</view>
 			<view class="money-item">
 				<text class="money-title">消费金额</text>
-				<view class="money-num">{{  list.vip.useAmount||0 }}</view>
+				<view class="money-num">{{ list?list.vip.useAmount:0 }}</view>
 			</view>
 		</view>
 		<view class="money-list" v-if="vdata.memberIsShow">
@@ -53,103 +54,128 @@
 </template>
 
 <script setup>
-import { ref, reactive, onMounted } from 'vue';
-import { $indexStatistics, $memberInfoCount } from '@/http/apiManager.js';
-import cal from '@/commons/utils/cal.js';
-import go from '@/commons/utils/go.js';
-import ak from '@/commons/utils/ak.js';
-import ent from '@/commons/utils/ent.js';
-import unionScan from '@/commons/utils/unionScan.js';
-import storageManage from '@/commons/utils/storageManage.js';
+	import {
+		ref,
+		reactive,
+		onMounted
+	} from 'vue';
+	import {
+		$indexStatistics,
+		$memberInfoCount
+	} from '@/http/apiManager.js';
+	import cal from '@/commons/utils/cal.js';
+	import go from '@/commons/utils/go.js';
+	import ak from '@/commons/utils/ak.js';
+	import ent from '@/commons/utils/ent.js';
+	import unionScan from '@/commons/utils/unionScan.js';
+	import storageManage from '@/commons/utils/storageManage.js';
 	import dayjs from 'dayjs' //时间格式库
 	import {
 		summaryTrade,
 	} from '@/http/yskApi/requestAll.js';
-onMounted(() => {
-	vdata.memberIsShow = ent.has('ENT_MCH_MEMBER') && storageManage.userInfo().isHasMemberEnt;
-	if (ent.has('ENT_MCH_MEMBER') && storageManage.userInfo().isHasMemberEnt) {
-		getMemberData();
-	}
-	getList()
-});
-const emits = defineEmits(['click']);
-const timeList = [
-	{ title: '今天', value: 'today' },
-	{ title: '昨天', value: 'yesterday' },
-	{ title: '近7天', value: 'circumference' },
-	{ title: '近30天', value: 'moon' }
-];
-let list = ref()
-const vdata = reactive({
-	timeSelected: 'today', // 当前时间选择器的
-	payAmount: -1, // 实收金额
-	payCount: -1, // 交易笔数
-	refundAmount: -1, // 退款金额
-	refundCount: -1, // 退款笔数
-	memberIsShow: false //是否开启会员模块
-});
-const memberData = reactive({});
-function getList(){
-	let startTime, endTime;
-	if (vdata.timeSelected == 'today') {
-		startTime = dayjs().format('YYYY-MM-DD') + ' 00:00:00'
-		endTime = dayjs().format('YYYY-MM-DD') + ' 23:59:59'
-	} else if (vdata.timeSelected == 'yesterday') {
-		startTime = formatTime() + ' 00:00:00'
-		endTime = formatTime() + ' 23:59:59'
-	} else if (vdata.timeSelected == 'circumference') {
-		startTime = dayjs().add(-7, 'day').format('YYYY-MM-DD 00:00:00')
-		endTime = dayjs().format('YYYY-MM-DD 23:59:59')
-	} else if (vdata.timeSelected == 'moon') {
-		startTime = dayjs().add(-30, 'day').format('YYYY-MM-DD 00:00:00')
-		endTime = dayjs().format('YYYY-MM-DD 23:59:59')
-	} else if (vdata.timeSelected == 'custom') {
-		startTime = start
-		endTime = end
-	}
-	summaryTrade({
-		shopId: uni.getStorageSync('shopId'),
-		startTime,
-		endTime,
-	}).then((res) => {
-		list.value = res
-	})
-}
-// 切换 时间卡片
-function changeTimeFunc(val) {
-	vdata.timeSelected = val;
-	getList()
-	// console.log(vdata.timeSelected,'调试121')
-	// refData();
-	// if (vdata.memberIsShow) {
-	// 	getMemberData();
-	// }
-}
-// 根据选择请求数据
-function refData() {
-	// 获取 统计数据
-	$indexStatistics(vdata.timeSelected).then(({ bizData }) => {
-		vdata.payAmount = bizData.totalSuccAmt;
-		vdata.payCount = bizData.totalSuccNum;
-		vdata.refundAmount = bizData.totalRefundAmt;
-		vdata.refundCount = bizData.totalRefundNum;
-	});
-}
-
-// 扫码动作
-function scanFunc() {
-	unionScan.scan(true).then((res) => {
-		// 登录类型
-		if (res.type == unionScan.QR_TYPE_LOGIN) {
-			return go.to('PAGES_SCAN_LOGIN', { qrcodeNo: res.originQrVal });
-		}
-
-		// 二维码
-		if (res.type == unionScan.QR_TYPE_QRC) {
-			return go.to('PAGES_APP_CODE_BIND', { qrcId: res.bizValue });
+	onMounted(() => {
+		vdata.memberIsShow = ent.has('ENT_MCH_MEMBER') && storageManage.userInfo().isHasMemberEnt;
+		if (ent.has('ENT_MCH_MEMBER') && storageManage.userInfo().isHasMemberEnt) {
+			getMemberData();
 		}
+		getList()
 	});
-}
+	const emits = defineEmits(['click']);
+	const timeList = [{
+			title: '今天',
+			value: 'today'
+		},
+		{
+			title: '昨天',
+			value: 'yesterday'
+		},
+		{
+			title: '近7天',
+			value: 'circumference'
+		},
+		{
+			title: '近30天',
+			value: 'moon'
+		}
+	];
+	let list = ref()
+	const vdata = reactive({
+		timeSelected: 'today', // 当前时间选择器的
+		payAmount: -1, // 实收金额
+		payCount: -1, // 交易笔数
+		refundAmount: -1, // 退款金额
+		refundCount: -1, // 退款笔数
+		memberIsShow: false //是否开启会员模块
+	});
+	const memberData = reactive({});
+
+	function getList() {
+		let startTime, endTime;
+		if (vdata.timeSelected == 'today') {
+			startTime = dayjs().format('YYYY-MM-DD') + ' 00:00:00'
+			endTime = dayjs().format('YYYY-MM-DD') + ' 23:59:59'
+		} else if (vdata.timeSelected == 'yesterday') {
+			startTime = formatTime() + ' 00:00:00'
+			endTime = formatTime() + ' 23:59:59'
+		} else if (vdata.timeSelected == 'circumference') {
+			startTime = dayjs().add(-7, 'day').format('YYYY-MM-DD 00:00:00')
+			endTime = dayjs().format('YYYY-MM-DD 23:59:59')
+		} else if (vdata.timeSelected == 'moon') {
+			startTime = dayjs().add(-30, 'day').format('YYYY-MM-DD 00:00:00')
+			endTime = dayjs().format('YYYY-MM-DD 23:59:59')
+		} else if (vdata.timeSelected == 'custom') {
+			startTime = start
+			endTime = end
+		}
+		summaryTrade({
+			shopId: uni.getStorageSync('shopId'),
+			startTime,
+			endTime,
+		}).then((res) => {
+			list.value = res
+		})
+	}
+	// 切换 时间卡片
+	function changeTimeFunc(val) {
+		vdata.timeSelected = val;
+		getList()
+		// console.log(vdata.timeSelected,'调试121')
+		// refData();
+		// if (vdata.memberIsShow) {
+		// 	getMemberData();
+		// }
+	}
+	// 根据选择请求数据
+	function refData() {
+		// 获取 统计数据
+		$indexStatistics(vdata.timeSelected).then(({
+			bizData
+		}) => {
+			vdata.payAmount = bizData.totalSuccAmt;
+			vdata.payCount = bizData.totalSuccNum;
+			vdata.refundAmount = bizData.totalRefundAmt;
+			vdata.refundCount = bizData.totalRefundNum;
+		});
+	}
+
+	// 扫码动作
+	function scanFunc() {
+		unionScan.scan(true).then((res) => {
+			// 登录类型
+			if (res.type == unionScan.QR_TYPE_LOGIN) {
+				return go.to('PAGES_SCAN_LOGIN', {
+					qrcodeNo: res.originQrVal
+				});
+			}
+
+			// 二维码
+			if (res.type == unionScan.QR_TYPE_QRC) {
+				return go.to('PAGES_APP_CODE_BIND', {
+					qrcId: res.bizValue
+				});
+			}
+		});
+	}
 	// 获取当前时间
 	function getdate() {
 		const dt = new Date();
@@ -172,98 +198,116 @@ function scanFunc() {
 		let d = dateFormat.getDate().toString().padStart(2, '0')
 		return `${y}-${m}-${d}`
 	}
-const getMemberData = () => {
-	$memberInfoCount({ queryDateRange: vdata.timeSelected }).then(({ bizData }) => {
-		Object.assign(memberData, bizData);
+	const getMemberData = () => {
+		$memberInfoCount({
+			queryDateRange: vdata.timeSelected
+		}).then(({
+			bizData
+		}) => {
+			Object.assign(memberData, bizData);
+		});
+	};
+	defineExpose({
+		refData
 	});
-};
-defineExpose({ refData });
 </script>
 
 <style lang="scss" scoped>
-.index-header {
-	width: 680rpx;
-	margin: 0 auto;
-	transform: translateY(30rpx);
-	margin-bottom: 25rpx;
-	padding: 20rpx;
-	box-sizing: border-box;
-	border-radius: $J-b-r32;
-	background: $jeepay-bg-primary;
-	backdrop-filter: blur(20rpx);
-	box-shadow: 0 50rpx 70rpx -60rpx rgba(0, 65, 164, 0.5);
-	.index-selected {
-		display: flex;
-		justify-content: space-between;
-		.index-time {
+	.index-header {
+		width: 680rpx;
+		margin: 0 auto;
+		transform: translateY(30rpx);
+		margin-bottom: 25rpx;
+		padding: 20rpx;
+		box-sizing: border-box;
+		border-radius: $J-b-r32;
+		background: $jeepay-bg-primary;
+		backdrop-filter: blur(20rpx);
+		box-shadow: 0 50rpx 70rpx -60rpx rgba(0, 65, 164, 0.5);
+
+		.index-selected {
 			display: flex;
 			justify-content: space-between;
-			align-items: center;
-			width: 490rpx;
-			height: 90rpx;
-			border-radius: 20rpx;
-			padding: 10rpx;
-			background-color: rgba($color: #fff, $alpha: 0.1);
-			.time-item {
-				flex: 1;
-				// width: 120rpx;
-				height: 100%;
-				font-size: 32rpx;
-				font-weight: 500;
-				color: rgba(255, 255, 255, 0.75);
+
+			.index-time {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				width: 490rpx;
+				height: 90rpx;
+				border-radius: 20rpx;
+				padding: 10rpx;
+				background-color: rgba($color: #fff, $alpha: 0.1);
+
+				.time-item {
+					flex: 1;
+					// width: 120rpx;
+					height: 100%;
+					font-size: 32rpx;
+					font-weight: 500;
+					color: rgba(255, 255, 255, 0.75);
+				}
+
+				.time-active {
+					background-color: $J-bg-ff;
+					color: $J-color-t21;
+					border-radius: 12rpx;
+				}
 			}
-			.time-active {
-				background-color: $J-bg-ff;
-				color: $J-color-t21;
-				border-radius: 12rpx;
+
+			.index-scan {
+				width: 110rpx;
+				height: 110rpx;
+				border-radius: 20rpx;
+				background-color: rgba($color: #fff, $alpha: 0.1);
+
+				image {
+					width: 41rpx;
+					height: 35rpx;
+				}
 			}
 		}
-		.index-scan {
-			width: 110rpx;
+
+		.receipts-money {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			margin: 30rpx 0;
+			color: $J-color-tff;
+
+			.money-num {
+				font-size: 70rpx;
+				font-weight: 500;
+			}
+		}
+
+		.money-list {
+			display: flex;
+			justify-content: space-between;
+			padding: 0 72rpx;
+			margin-bottom: 50rpx;
+			text-align: center;
+			color: $J-color-tff;
+
+			.money-item {
+				.money-num {
+					font-size: 32rpx;
+					font-weight: 500;
+				}
+			}
+		}
+
+		.money-title {
+			margin-bottom: 10rpx;
+			font-size: 26rpx;
+			font-weight: 400;
+			color: $J-color-tSff;
+		}
+
+		.quick-money {
 			height: 110rpx;
 			border-radius: 20rpx;
-			background-color: rgba($color: #fff, $alpha: 0.1);
-			image {
-				width: 41rpx;
-				height: 35rpx;
-			}
+			color: $J-color-t29;
 		}
 	}
-	.receipts-money {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		margin: 30rpx 0;
-		color: $J-color-tff;
-		.money-num {
-			font-size: 70rpx;
-			font-weight: 500;
-		}
-	}
-	.money-list {
-		display: flex;
-		justify-content: space-between;
-		padding: 0 72rpx;
-		margin-bottom: 50rpx;
-		text-align: center;
-		color: $J-color-tff;
-		.money-item {
-			.money-num {
-				font-size: 32rpx;
-				font-weight: 500;
-			}
-		}
-	}
-	.money-title {
-		margin-bottom: 10rpx;
-		font-size: 26rpx;
-		font-weight: 400;
-		color: $J-color-tSff;
-	}
-	.quick-money {
-		height: 110rpx;
-		border-radius: 20rpx;
-		color: $J-color-t29;
-	}
-}
-</style>
+</style>
\ No newline at end of file

From 51d273314e1e2ee2aec1998b3e0efd73181d8cc5 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Wed, 23 Oct 2024 15:28:34 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=A0=81400=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E8=B7=B3=E8=BD=AC=E7=99=BB=E5=BD=95=E3=80=82?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=A1=B6=E9=83=A8=E6=8E=A5=E5=8F=A3=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 http/yskApi/http.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/http/yskApi/http.js b/http/yskApi/http.js
index 81590ba..2ebc105 100644
--- a/http/yskApi/http.js
+++ b/http/yskApi/http.js
@@ -75,6 +75,7 @@ function commonsProcess(showLoading, httpReqCallback) {
 		} = httpData
 		// 避免混淆重新命名
 		let bodyData = data
+		console.log(statusCode,1111111111)
 		if (statusCode == 500) {
 			isShowErrorToast = true
 			return Promise.reject(bodyData) // 跳转到catch函数
@@ -124,7 +125,7 @@ function commonsProcess(showLoading, httpReqCallback) {
 		return Promise.resolve(bodyData)
 
 	}).catch(res => {
-		if(res.status==401){
+		if(res.status==401||res.status==400){
 			storageManage.token(null, true)
 			infoBox.showErrorToast('请登录').then(() => {
 				go.to("PAGES_LOGIN", {}, go.GO_TYPE_RELAUNCH)
@@ -183,7 +184,6 @@ function request(args) {
 	} = args
 	let headerObject = {}
 	// headerObject[appConfig.tokenKey] = storageManage.token()
-
 	return commonsProcess(showLoading, () => {
 		return uni.request(
 			Object.assign({