diff --git a/App.vue b/App.vue index 6fa2369..7793ebf 100644 --- a/App.vue +++ b/App.vue @@ -32,7 +32,7 @@ history } from '@/api/public.js' import Routine from './libs/routine.js'; -import { Toast } from "./libs/uniApi"; + import { Toast } from "./libs/uniApi"; export default { data() { diff --git a/pages/admin/stockOut/index.vue b/pages/admin/stockOut/index.vue index a783911..89c2f67 100644 --- a/pages/admin/stockOut/index.vue +++ b/pages/admin/stockOut/index.vue @@ -315,6 +315,7 @@ this.getCartNum(); }, scanCode() { + // return this.addCartGoods('6944411605079'); const that = this uni.scanCode({ scanType: ["qrCode", "barCode", "datamatrix", "pdf417"], diff --git a/pages/index/index.vue b/pages/index/index.vue index 754fc2f..c2e636f 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1028,8 +1028,13 @@ import { Toast } from '../../libs/uniApi'; }, //个人详情 logout() { + // #ifdef H5 + this.$refs.popup1.open() + // #endif + // #ifndef H5 if(ENV=='prod') this.byset() else this.$refs.popup1.open() + // #endif }, //登录 diff --git a/pages/users/login/login_copy.vue b/pages/users/login/login_copy.vue index 00d363e..2c6c8f1 100644 --- a/pages/users/login/login_copy.vue +++ b/pages/users/login/login_copy.vue @@ -187,9 +187,9 @@ - +