diff --git a/.env.development b/.env.development index 20d3079..652f58c 100644 --- a/.env.development +++ b/.env.development @@ -11,10 +11,6 @@ VITE_API_WSS = 'wss://cashier.sxczgkj.cn/client' # 阿伟本地ws # VITE_API_WSS = 'ws://192.168.2.17:9998/client' - -# 测试 php -# VITE_API_PHP_URL = 'http://192.168.2.33:1666/index.php/api' - # 正式 php VITE_API_PHP_URL = 'http://czgdoumei.sxczgkj.com/index.php/api' diff --git a/.env.production b/.env.production index 2210fdf..e77f3f0 100644 --- a/.env.production +++ b/.env.production @@ -4,17 +4,8 @@ ENV = production # 正式ws VITE_API_WSS = 'wss://cashier.sxczgkj.cn/client' -#测试ws -# VITE_API_WSS = 'wss://wxcashiertest.sxczgkj.cn/client' - -# 测试 php -# VITE_API_PHP_URL = 'http://192.168.2.33:1666/index.php/api' - # 正式 php VITE_API_PHP_URL = 'http://czgdoumei.sxczgkj.com/index.php/api' -# 测试 -# VITE_API_URL = 'https://cashier-client.sxczgkj.cn/cashier-client' - # 线上环境接口地址 VITE_API_URL = 'https://cashierclient.sxczgkj.cn/cashier-client/' \ No newline at end of file diff --git a/.env.test b/.env.test new file mode 100644 index 0000000..eb87bdc --- /dev/null +++ b/.env.test @@ -0,0 +1,17 @@ +# 线上环境 +ENV = test + +#测试ws +# VITE_API_WSS = 'wss://wxcashiertest.sxczgkj.cn/client' + +# 正式ws +VITE_API_WSS = 'wss://cashier.sxczgkj.cn/client' + +# 正式 php +VITE_API_PHP_URL = 'http://czgdoumei.sxczgkj.com/index.php/api' + +# 测试 +# VITE_API_URL = 'https://cashier-client.sxczgkj.cn/cashier-client' + +# 正式 +VITE_API_URL = 'https://cashierclient.sxczgkj.cn/cashier-client' \ No newline at end of file diff --git a/package.json b/package.json index 82ed0a7..e76a9be 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,12 @@ { "name": "vite-electron", "private": true, - "version": "1.4.3", + "version": "1.4.6", "main": "dist-electron/main.js", "scripts": { "dev": "chcp 65001 && vite", "build": "node ./addVersion.js && vite build && electron-builder", + "build:test": "vite build --mode test && electron-builder", "preview": "vite preview", "build:win": "node ./addVersion.js && vite build && electron-builder --w" }, diff --git a/src/App.vue b/src/App.vue index 3fb0122..d9a1d80 100644 --- a/src/App.vue +++ b/src/App.vue @@ -171,8 +171,8 @@ const updateInfo = _.throttle(function () { // let info = navigator.connection console.log(isOnLine); // console.log(info); - if (store.userInfo && store.userInfo.shopId) { - if (isOnLine) { + if (store.userInfo && store.userInfo.shopId) { + if (isOnLine) { console.log('有网了重新连接ws~'); socket.init(); } else { @@ -193,7 +193,6 @@ onMounted(() => { } ipcRenderer.on('showCloseDialog', (event, arg) => { - console.log('阻止系统关闭软件'); ElMessageBox.confirm("确定要关闭软件吗？") .then(() => { ipcRenderer.send("quitHandler", "退出吧"); diff --git a/src/api/group.js b/src/api/group.js index 5da4d7d..febf1d3 100644 --- a/src/api/group.js +++ b/src/api/group.js @@ -119,3 +119,29 @@ export function douyinfulfilmentcertificatecancel(data) { data, }); } + +/** + * 门店列表 + * @param {*} data + * @returns + */ +export function douyinstorelist(data) { + return request_php({ + method: "post", + url: "douyin/storelist", + data, + }); +} + +/** + * 绑定门店 + * @param {*} data + * @returns + */ +export function douyinbindstore(data) { + return request_php({ + method: "post", + url: "douyin/bindstore", + data, + }); +} diff --git a/src/utils/request_php.js b/src/utils/request_php.js index 80a3fb1..84055a8 100644 --- a/src/utils/request_php.js +++ b/src/utils/request_php.js @@ -7,7 +7,7 @@ const service = axios.create({ baseURL: import.meta.env.MODE == "development" ? "/php/" - : import.meta.env.VITE_API_URL, + : import.meta.env.VITE_API_PHP_URL, // withCredentials: true, // 跨域请求时发送 cookies timeout: 5000, // 请求超时 }); diff --git a/src/views/group_buy/components/bindShop.vue b/src/views/group_buy/components/bindShop.vue new file mode 100644 index 0000000..a6d054c --- /dev/null +++ b/src/views/group_buy/components/bindShop.vue @@ -0,0 +1,104 @@ + + + + + \ No newline at end of file diff --git a/src/views/group_buy/components/scanGroup.vue b/src/views/group_buy/components/scanGroup.vue index 4cdec58..d004632 100644 --- a/src/views/group_buy/components/scanGroup.vue +++ b/src/views/group_buy/components/scanGroup.vue @@ -2,7 +2,7 @@ - + @@ -93,6 +92,7 @@ @click="groupOrdergroupScanHandle">确认核销 + @@ -102,6 +102,8 @@ import { ref } from "vue"; import icon from "@/assets/icon_scan.png"; import { groupOrderorderInfo, groupOrdergroupScan, douyinfulfilmentcertificateprepare, douyincertificateprepare } from '@/api/group' import { useUser } from "@/store/user.js"; +import BindShop from './bindShop.vue' +const BindShopRef = ref(null) const store = useUser(); import { queryMembermember, @@ -110,6 +112,10 @@ import { accountPaymember, } from "@/api/member/index.js"; import { ElMessage } from "element-plus"; + +import { useGlobal } from '@/store/global.js' +const global = useGlobal() + const emits = defineEmits(["success"]); const props = defineProps({ @@ -152,7 +158,8 @@ async function groupOrdergroupScanHandle() { case 2: { groupDetailLoading.value = true - let encrypted_codes = groupDetail.value.goods.map(item => item.encrypted_code) + let encrypted_codes = douyin_table.value.getSelectionRows().map(item => item.encrypted_code) + console.log(encrypted_codes); const res = await douyincertificateprepare({ verify_token: groupDetail.value.verify_token, encrypted_codes: encrypted_codes.join(','), @@ -171,17 +178,12 @@ async function groupOrdergroupScanHandle() { emits('succcess') } catch (error) { groupDetailLoading.value = false - console.log(error); + console.log('groupOrdergroupScanHandle.error', error); } } const douyin_table = ref(null) -// 选择要核销的券 -function douyinSelectionChange(e) { - console.log(e); -} - // 核销券码 async function submitHandle() { try { @@ -202,6 +204,7 @@ async function submitHandle() { const res = await douyinfulfilmentcertificateprepare({ object_id: decodeURI(scanCode.value), }); + dialogVisible.value = false loading.value = false groupDetail.value = res detailVisible.value = true @@ -217,7 +220,10 @@ async function submitHandle() { } } catch (error) { loading.value = false - console.log(error); + console.log('submitHandle.error', error); + if (error.code == 4399) { + BindShopRef.value.show() + } } } @@ -255,6 +261,7 @@ const inputChange = _.debounce(function (e) { }, 500); function show() { + global.updateData(true) dialogVisible.value = true; setTimeout(() => { inputRef.value.focus(); @@ -262,6 +269,7 @@ function show() { } function close() { + global.updateData(false) dialogVisible.value = false; } @@ -274,6 +282,7 @@ defineExpose({ show, close, loading, + submitHandle }); diff --git a/src/views/group_buy/index.vue b/src/views/group_buy/index.vue index 5a09b8a..7be5fc0 100644 --- a/src/views/group_buy/index.vue +++ b/src/views/group_buy/index.vue @@ -3,7 +3,7 @@
- + @@ -79,14 +79,16 @@