更新增加打折权限校验

http/yskApi/http.js

@@ -92,21 +92,21 @@ function commonsProcess(showLoading, httpReqCallback) {
 			return Promise.reject(bodyData) // 跳转到catch函数
 		}
 
-		// 业务响应异常
-		if (bodyData.hasOwnProperty('code') && bodyData.code != 200) {
-			isShowErrorToast = true
-			infoBox.showToast(bodyData.msg)
-			if (bodyData.code == 5005) { // 密码已过期， 直接跳转到更改密码页面
-				uni.reLaunch({
-					url: '/pageUser/setting/updatePwd'
-				})
-			}
-			// if(bodyData.code == 500){ // 密码已过期， 直接跳转到更改密码页面
-			// 	uni.redirectTo({url: '/pages/login/index'})
-			// }
-			return bodyData
-			// return Promise.reject(bodyData)
-		}
+		// // 业务响应异常
+		// if (bodyData.hasOwnProperty('code') && bodyData.code != 200) {
+		// 	isShowErrorToast = true
+		// 	infoBox.showToast(bodyData.msg)
+		// 	if (bodyData.code == 5005) { // 密码已过期， 直接跳转到更改密码页面
+		// 		uni.reLaunch({
+		// 			url: '/pageUser/setting/updatePwd'
+		// 		})
+		// 	}
+		// 	// if(bodyData.code == 500){ // 密码已过期， 直接跳转到更改密码页面
+		// 	// 	uni.redirectTo({url: '/pages/login/index'})
+		// 	// }
+		// 	return bodyData
+		// 	// return Promise.reject(bodyData)
+		// }
 
 		// 加密数据
 		if (!bodyData.data && bodyData.encryptData) {

pageProduct/add-specifications/choose-specifications.vue

@@ -13,8 +13,8 @@
 								</uni-data-picker>
 							</uni-forms-item>
 						</view>
-						<view class="">
-							<view class="u-m-t-32" v-for="(item,index) in FormData.selectSpec" :key="index">
+						<view class="u-p-b-20">
+							<view class="u-m-t-12" v-for="(item,index) in FormData.selectSpec" :key="index">
 
 								<view class="font-bold">
 									{{item.name}}
@@ -39,7 +39,7 @@
 							validateTrigger="blur" :border="true" :label-width="130">
 
 							<view class="">
-								<view class="u-m-t-16" v-for="(val,key) in item.names" :key="key">
+								<view class="u-m-t-20" v-for="(val,key) in item.names" :key="key">
 									<text class="font-bold u-m-r-12">
 										{{key}}
 									</text>

pageProduct/index/components/edit-stock.vue

@@ -125,6 +125,7 @@
 	import {
 		$tbShopUnit,$getProductStockDetail
 	} from '@/http/yskApi/goods.js'
+	import go from '@/commons/utils/go.js'
 	const refForm = ref(null)
 	const props = defineProps({
 		show: {
@@ -152,6 +153,9 @@
 		]
 	}) 
 	function toRecodes(){
+		go.to('PAGES_PRODUCT_INVOICING_LIST',{
+			productId:props.goods.id
+		})
 	}
 	function changeShowRecoders(show) {
 		recoders.show = show

pages/index/index.vue

@@ -46,11 +46,12 @@
 	uni.hideTabBar()
 	onLoad((options) => {});
 	// 导航列表
-	const navList = [{
-			title: '收银',
-			icon: '/static/indexImg/icon-cashier.svg',
-			pageUrl: 'PAGES_QUICK_PAY',
-		},
+	const navList = [
+		// {
+		// 	title: '收银',
+		// 	icon: '/static/indexImg/icon-cashier.svg',
+		// 	pageUrl: 'PAGES_QUICK_PAY',
+		// },
 		{
 			title: '销售汇总',
 			icon: '/static/indexImg/PAGE_SALES_SUMMARY.svg',

pagesOrder/pay-order/pay-order.vue

@@ -10,7 +10,7 @@
 				<text class=" ">{{order.amount}}</text>
 			</view>
 			<view class="u-m-t-10 u-flex u-row-center color-main">
-				<view @click="showModel('editMoney',true)">修改</view>
+				<view @click="discountShow">修改</view>
 			</view>
 		</view>
 		<view class="content bg-fff  border-r-12">
@@ -119,9 +119,16 @@
 	import {
 		queryAllShopUser
 	} from '@/http/yskApi/shop-user.js'
+	import {hasPermission} from '@/commons/utils/hasPermission.js'
 	import * as orderApi from '@/http/yskApi/order.js'
 	import infoBox from '@/commons/utils/infoBox.js'
 	import editDiscount from '@/components/my-components/edit-discount.vue'
+	async function discountShow(){
+		const bol=await hasPermission('yun_xu_da_zhe')
+		if(bol){
+			showModel('editMoney',true)
+		}
+	}
 	let option = {isNowPay:false}
 	let payFinish=ref(false)
 	onBackPress(() => {