diff --git a/http/yskApi/http.js b/http/yskApi/http.js index 47ef1f2..8b6b997 100644 --- a/http/yskApi/http.js +++ b/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) { diff --git a/pageProduct/add-specifications/choose-specifications.vue b/pageProduct/add-specifications/choose-specifications.vue index dd3f38d..cb7b730 100644 --- a/pageProduct/add-specifications/choose-specifications.vue +++ b/pageProduct/add-specifications/choose-specifications.vue @@ -13,8 +13,8 @@ - - + + {{item.name}} @@ -39,7 +39,7 @@ validateTrigger="blur" :border="true" :label-width="130"> - + {{key}} diff --git a/pageProduct/index/components/edit-stock.vue b/pageProduct/index/components/edit-stock.vue index 03f9750..b3cd86a 100644 --- a/pageProduct/index/components/edit-stock.vue +++ b/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 diff --git a/pages/index/index.vue b/pages/index/index.vue index 8ce8621..c6065a2 100644 --- a/pages/index/index.vue +++ b/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', diff --git a/pagesOrder/pay-order/pay-order.vue b/pagesOrder/pay-order/pay-order.vue index 7746b34..779c032 100644 --- a/pagesOrder/pay-order/pay-order.vue +++ b/pagesOrder/pay-order/pay-order.vue @@ -10,7 +10,7 @@ {{order.amount}} - 修改 + 修改 @@ -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(() => {