From cba285c943936101ed5713e6bb161f0126d358b8 Mon Sep 17 00:00:00 2001 From: wtq <2394975549@qq.com> Date: Mon, 15 Dec 2025 10:46:39 +0800 Subject: [PATCH] =?UTF-8?q?'=E4=BF=AE=E6=94=B9=E9=A5=BF=E4=BA=86=E4=B9=88?= =?UTF-8?q?=E5=90=8D=E7=A7=B0'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.ts | 6 +- src/App.vue | 22 ++-- src/composables/useOrderInfo.ts | 45 +++---- src/manifest.json | 41 +++---- .../childPages/right-main/right-main.vue | 2 +- src/pages/merchant/options/options.vue | 54 ++++----- src/pages/merchant/userInfo/userInfo.ts | 10 +- src/pages/message/index.vue | 2 +- .../childPages/component/orderListTop.vue | 2 +- .../childPages/order-filter/order-filter.vue | 4 +- src/static/font/iconfont.css | 2 +- src/store/useStoreInfoStore/getters.ts | 4 +- src/subPages/agreement/updateVersion.vue | 11 +- src/subPages/login/index.vue | 11 +- src/subPages/login/weixin.ts | 20 +++- src/subPages/login/wxLogin/wxLogin.ts | 42 +++++-- src/subPages/login/wxLogin/wxLogin.vue | 7 +- .../accountBalance/accountBalance.vue | 4 +- .../setInvoiceEB/setInvoiceEB.ts | 4 +- src/subPages/merchantChild/setUp/setUp.ts | 1 + src/subPages/merchantChild/setUp/setUp.vue | 14 +-- .../merchantChild/shareStore/shareStore.vue | 5 +- src/subPages/messageChild/msgChat/msgChat.ts | 2 +- src/subPages/orderChild/getPhone/getPhone.vue | 4 +- .../orderChild/orderDetail/orderDetail.ts | 1 + .../orderChild/orderDetail/orderDetail.vue | 2 +- src/uni_modules/wtq-harmony/changelog.md | 0 src/uni_modules/wtq-harmony/package.json | 110 ------------------ src/uni_modules/wtq-harmony/readme.md | 7 -- .../utssdk/app-android/config.json | 3 - .../wtq-harmony/utssdk/app-android/index.uts | 95 --------------- .../utssdk/app-harmony/config.json | 4 - .../wtq-harmony/utssdk/app-harmony/index.uts | 72 ------------ .../wtq-harmony/utssdk/app-ios/config.json | 3 - .../wtq-harmony/utssdk/app-ios/index.uts | 85 -------------- .../wtq-harmony/utssdk/interface.uts | 54 --------- .../wtq-harmony/utssdk/unierror.uts | 41 ------- src/utils/bluetoothPrinter/printerTemplate.ts | 12 +- src/utils/configCms.ts | 14 +-- 39 files changed, 195 insertions(+), 627 deletions(-) delete mode 100644 src/uni_modules/wtq-harmony/changelog.md delete mode 100644 src/uni_modules/wtq-harmony/package.json delete mode 100644 src/uni_modules/wtq-harmony/readme.md delete mode 100644 src/uni_modules/wtq-harmony/utssdk/app-android/config.json delete mode 100644 src/uni_modules/wtq-harmony/utssdk/app-android/index.uts delete mode 100644 src/uni_modules/wtq-harmony/utssdk/app-harmony/config.json delete mode 100644 src/uni_modules/wtq-harmony/utssdk/app-harmony/index.uts delete mode 100644 src/uni_modules/wtq-harmony/utssdk/app-ios/config.json delete mode 100644 src/uni_modules/wtq-harmony/utssdk/app-ios/index.uts delete mode 100644 src/uni_modules/wtq-harmony/utssdk/interface.uts delete mode 100644 src/uni_modules/wtq-harmony/utssdk/unierror.uts diff --git a/src/App.ts b/src/App.ts index f199788..7f95018 100644 --- a/src/App.ts +++ b/src/App.ts @@ -120,9 +120,9 @@ function App() { return 0 case '美团外卖': return 1 - case '饿了么': - return 2 - case '饿百新零售': + // case '淘宝闪购': + // return 2 + case '淘宝闪购新零售': return 3 case '京东商城': return 5 diff --git a/src/App.vue b/src/App.vue index 967a849..5d7c995 100644 --- a/src/App.vue +++ b/src/App.vue @@ -13,7 +13,7 @@ const { appKeepAlive, // 应用保活 listenMsg, // 监听消息 } = App() -const { watchVersion } = useGlobalFunc() // 监听版本 +// const { watchVersion } = useGlobalFunc() // 监听版本 // 三端通用 const { @@ -33,16 +33,16 @@ onLaunch(() => { uni['globalAlert'] = globalAlert // 挂载全局可覆盖tabar弹窗 // plus.device.setWakelock(true) //打开程序后一直保持唤醒状态（常亮） - watchVersion((isUpdate: boolean) => { - // 检查是否更新版本 - if (isUpdate) { - // uni.globalAlert({ - // data: { - // type: 3, - // }, - // }) - } - }) + // watchVersion((isUpdate: boolean) => { + // // 检查是否更新版本 + // if (isUpdate) { + // // uni.globalAlert({ + // // data: { + // // type: 3, + // // }, + // // }) + // } + // }) // 初始化平台 if (!getStorage('terrace')) setStorage('terrace', 'jxcs') diff --git a/src/composables/useOrderInfo.ts b/src/composables/useOrderInfo.ts index e62c38f..0ba4ece 100644 --- a/src/composables/useOrderInfo.ts +++ b/src/composables/useOrderInfo.ts @@ -78,28 +78,29 @@ function useOrderInfo() { * @param {string} vendorID 品牌ID */ async function printerOrder(vendorOrderID: string, vendorID: string) { - if (getStorage('defaultPrinter') == '0') { - // 蓝牙打印机 - bluetoothPrinter(vendorOrderID) - } else if (getStorage('defaultPrinter') == '1') { - // 网络打印机 - internetPrinter(vendorOrderID, vendorID) - } else { - // 手动选择 - uni.jxConfirm({ - title: '选择设备', - content: '请选择打印设备进行打印', - confirmText: '网络打印', - cancelText: '蓝牙打印', - isReturn: 1, - success: () => { - internetPrinter(vendorOrderID, vendorID) - }, - fail: () => { - bluetoothPrinter(vendorOrderID) - } - }) - } + internetPrinter(vendorOrderID, vendorID) + // if (getStorage('defaultPrinter') == '0') { + // // 蓝牙打印机 + // bluetoothPrinter(vendorOrderID) + // } else if (getStorage('defaultPrinter') == '1') { + // // 网络打印机 + // internetPrinter(vendorOrderID, vendorID) + // } else { + // // 手动选择 + // uni.jxConfirm({ + // title: '选择设备', + // content: '请选择打印设备进行打印', + // confirmText: '网络打印', + // cancelText: '蓝牙打印', + // isReturn: 1, + // success: () => { + // internetPrinter(vendorOrderID, vendorID) + // }, + // fail: () => { + // bluetoothPrinter(vendorOrderID) + // } + // }) + // } } /** diff --git a/src/manifest.json b/src/manifest.json index 15a448c..4706de0 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,7 +1,7 @@ { "name" : "京西到家商家版", "appid" : "__UNI__F9A47D3", - "description" : "1、商户通过京西平台同时管理美团、饿了么、京东等多个外卖平台实现一键上架、下架、修改、删除多个平台商品；2、商户通过京西平台可以同时对、美团专送、达达、顺丰同城等多个专送平台召唤偶骑手", + "description" : "1、商户通过京西平台同时管理美团、淘宝闪购、京东等多个外卖平台实现一键上架、下架、修改、删除多个平台商品；2、商户通过京西平台可以同时对、美团专送、达达、顺丰同城等多个专送平台召唤偶骑手", "versionName" : "1.0.0", "versionCode" : 100, "transformPx" : false, @@ -236,15 +236,16 @@ } }, "app-harmony" : { - // "darkmode" : true, - // "themeLocation" : "theme.json", - "safearea": { //iOS平台的安全区域 - "background": "#ffffff", - "backgroundDark": "#2f0508", // HX 3.1.19+支持 - "bottom": { - "offset": "none" // 在没有 tabBar 时，底部区域是否需要占位 - } - }, + // "darkmode" : true, + // "themeLocation" : "theme.json", + "safearea" : { + //iOS平台的安全区域 + "background" : "#ffffff", + "backgroundDark" : "#2f0508", // HX 3.1.19+支持 + "bottom" : { + "offset" : "none" // 在没有 tabBar 时，底部区域是否需要占位 + } + }, "distribute" : { "bundleName" : "com.jxc4.www", "signingConfigs" : { @@ -268,26 +269,14 @@ } }, "icons" : { - "foreground" : "D:/wtq/交接文档new (2)/交接文档new/交接文档new/京西菜市商家版/素材/1024.png", - "background" : "D:/wtq/交接文档new (2)/交接文档new/交接文档new/京西菜市商家版/素材/1024.png" + "foreground" : "D:/wtq/交接文档new (2)/交接文档new/交接文档new/京西菜市商家版/素材/hormony_foreground1024.png", + "background" : "D:/wtq/交接文档new (2)/交接文档new/交接文档new/京西菜市商家版/素材/harmony_background1024.png" }, "splashScreens" : { - "startWindowIcon" : "D:/wtq/交接文档new (2)/交接文档new/交接文档new/京西菜市商家版/素材/1024.png", + "startWindowIcon" : "D:/wtq/交接文档new (2)/交接文档new/交接文档new/京西菜市商家版/素材/hormony_foreground1024.png", "startWindowBackground" : "" }, - "modules" : { - "uni-oauth" : { - "weixin" : { - "appid" : "wx18111a41fd17f24f" - } - }, - "uni-share" : { - "weixin" : { - "appid" : "wx18111a41fd17f24f" - } - }, - "uni-map" : {} - }, + "modules" : {}, "targetSdkVersion" : "6.0.0.868", "permissions" : [ { diff --git a/src/pages/goods-manager/childPages/right-main/right-main.vue b/src/pages/goods-manager/childPages/right-main/right-main.vue index 85e1b75..2aaf445 100644 --- a/src/pages/goods-manager/childPages/right-main/right-main.vue +++ b/src/pages/goods-manager/childPages/right-main/right-main.vue @@ -80,7 +80,7 @@ (sku.ebaiSyncStatus & 2) !== 2 && (sku.ebaiSyncStatus & 4) !== 4 " - >饿佰:该商品无法修改价格,请联系运营修改淘宝闪购:该商品无法修改价格,请联系运营修改 diff --git a/src/pages/merchant/options/options.vue b/src/pages/merchant/options/options.vue index 839ff55..afa73a6 100644 --- a/src/pages/merchant/options/options.vue +++ b/src/pages/merchant/options/options.vue @@ -131,12 +131,12 @@ const oldVersion = ref(uni.getSystemInfoSync().appVersion) // 版本号 // 不用展示信息的图标 // 未下载微信不展示 const grindListData = ref([ - { - id: 1, - icon: '/static/merchant-icon/1.png', - title: '加入群聊', - isIos: true, - }, + // { + // id: 1, + // icon: '/static/merchant-icon/1.png', + // title: '加入群聊', + // isIos: true, + // }, { id: 2, icon: '/static/merchant-icon/2.png', @@ -167,12 +167,12 @@ const grindListData = ref([ title: '消息通知', isIos: false, }, - { - id: 7, - icon: '/static/merchant-icon/7.png', - title: '物料申请', - isIos: true, - }, + // { + // id: 7, + // icon: '/static/merchant-icon/7.png', + // title: '物料申请', + // isIos: true, + // }, { id: 16, icon: '/static/merchant-icon/8.png', @@ -221,12 +221,12 @@ const grindListData = ref([ title: '注册时间', isIos: false, }, - { - id: 15, - icon: '/static/merchant-icon/17.png', - title: '打开小程序', - isIos: true, - }, + // { + // id: 15, + // icon: '/static/merchant-icon/17.png', + // title: '打开小程序', + // isIos: true, + // }, { id: 18, icon: '/static/merchant-icon/19.png', @@ -250,12 +250,12 @@ const grindListData = ref([ title: '配送余额', isIos: false, }, - { - id: 17, - icon: '/static/merchant-icon/18.png', - title: '检查更新', - isIos: false, - }, + // { + // id: 17, + // icon: '/static/merchant-icon/18.png', + // title: '检查更新', + // isIos: false, + // }, ]) /************************************************* @@ -338,9 +338,9 @@ function grindData(title: number) { case 16: uni.navigateTo({ url: '/subPages/merchantChild/shareStore/shareStore' }) // 扫码进店 break - case 17: - isUpdate(1) // 检查更新 - break + // case 17: + // isUpdate(1) // 检查更新 + // break case 18: uni.navigateTo({ url: '/subPages/merchantChild/useInfo/useInfo' }) // 个人信息 break diff --git a/src/pages/merchant/userInfo/userInfo.ts b/src/pages/merchant/userInfo/userInfo.ts index 7cb291a..b92272e 100644 --- a/src/pages/merchant/userInfo/userInfo.ts +++ b/src/pages/merchant/userInfo/userInfo.ts @@ -112,7 +112,6 @@ function userInfo() { }, success: function (res) { logOutFn(); - // uni.navigateTo({ url: '/subPages/login/wxLogin/wxLogin' }) uni.reLaunch({ url: '/subPages/login/wxLogin/wxLogin' }) }, fail: () => { @@ -125,9 +124,14 @@ function userInfo() { * 切换门店 */ function switchStore() { - uni.navigateTo({ url: "/subPages/switchStore/switchStore" }); + console.log('你有反应吗') + uni.navigateTo({ url: "/subPages/switchStore/switchStore", + complete(res){ + console.log('你有反应吗，为啥不跳转',JSON.stringify(res,undefined,4)) + } + }); // store.commit('storeInfo/jxLoadingFn', true) - // console.log('切换门店11111111111') + // console.log('切换门店11111111111',JSON.stringify(uni.getSystemInfoSync(),undefined,4)) // openAppProduct({ // success: (res : any) => { // console.log('切换门店,,,,,,,,success: ', JSON.stringify(res,undefined,4)); diff --git a/src/pages/message/index.vue b/src/pages/message/index.vue index a8ccbb6..432ca70 100644 --- a/src/pages/message/index.vue +++ b/src/pages/message/index.vue @@ -22,7 +22,7 @@ :title=" item.vendorID == 1 ? `【美团${item.orderDesc}】${item.userID === '0' ? '群发消息' : item.userID}` - : `【饿了么】${item.userID}` + : `【淘宝闪购】${item.userID}` " :avatar=" item.vendorID == 1 diff --git a/src/pages/order-manager/childPages/component/orderListTop.vue b/src/pages/order-manager/childPages/component/orderListTop.vue index 2dacdc7..69609ff 100644 --- a/src/pages/order-manager/childPages/component/orderListTop.vue +++ b/src/pages/order-manager/childPages/component/orderListTop.vue @@ -36,7 +36,7 @@ 拨打电话 - 发消息 + 发消息 + 当前版本 𝑽 {{ oldVersion }} - + - + diff --git a/src/subPages/login/index.vue b/src/subPages/login/index.vue index 973d38f..4217aad 100644 --- a/src/subPages/login/index.vue +++ b/src/subPages/login/index.vue @@ -2,12 +2,16 @@ - - + + + + {{ navTitle }} + + @@ -103,6 +107,7 @@ const { agreement, // 是否同意协议 isAgreement, // 是否同意协议 clickLeft, // 点击返回 + // isLogin, // 是否登录 } = weixinFn() diff --git a/src/subPages/login/weixin.ts b/src/subPages/login/weixin.ts index 4fbe665..a6e3348 100644 --- a/src/subPages/login/weixin.ts +++ b/src/subPages/login/weixin.ts @@ -3,7 +3,7 @@ import useGlobalFunc from "@/composables/useGlobalFunc"; import { store } from "@/store"; import { getStorage, setStorage } from "@/utils/storage"; import { onShow } from "@dcloudio/uni-app"; -import { onBeforeUnmount, ref, Ref } from "vue"; +import { computed, onBeforeUnmount, ref, Ref } from "vue"; import toast from "@/utils/toast"; @@ -166,12 +166,27 @@ function weixinFn() { isAgreement.value = false } } - + + // const isLogin = computed(() => { + // return getStorage('token') ? true : false + // }) const clickLeft = (() => { + // console.log('点击返回，当前的登录状态',getStorage('token')) + // uni.navigateBack({ + // delta: 1 + // }); uni.navigateBack({ delta: 1 }); + // if(isLogin.value){ + + // uni.navigateBack({ + // delta: 1 + // }); + // }else{ + // uni.switchTab({ url: '/pages/merchant/index' }) + // } }) @@ -197,6 +212,7 @@ function weixinFn() { agreement, // 是否同意协议 isAgreement, // 是否同意协议 clickLeft, // 点击返回 + // isLogin, // 是否登录 } } diff --git a/src/subPages/login/wxLogin/wxLogin.ts b/src/subPages/login/wxLogin/wxLogin.ts index 4627801..112ea3a 100644 --- a/src/subPages/login/wxLogin/wxLogin.ts +++ b/src/subPages/login/wxLogin/wxLogin.ts @@ -1,5 +1,5 @@ import toast from "@/utils/toast"; -import { ref } from "vue"; +import { computed, ref } from "vue"; import useGlobalFunc from "@/composables/useGlobalFunc"; import { getStorage, setStorage } from "@/utils/storage"; import { store } from "@/store"; @@ -45,12 +45,15 @@ export default { // } else { // isWx.value = false // } - uni.getProvider({ - service: 'share', - success: function (res) { - // res.provider[0] === 'weixin' ? 微信已经安装 : 微信尚未安装 - isWx.value = res.provider[0] == 'weixin' ? true : false - }}) + + isWx.value = false + // // return + // uni.getProvider({ + // service: 'share', + // success: function (res) { + // // res.provider[0] === 'weixin' ? 微信已经安装 : 微信尚未安装 + // isWx.value = res.provider[0] == 'weixin' ? true : false + // }}) } /** @@ -148,13 +151,29 @@ export default { } //#endregion + + const isLogin = computed(() => { + return getStorage('token') ? true : false + }) + /** * 返回 */ const clickLeft = (() => { - uni.navigateBack({ - delta: 1 - }); + console.log('点击返回，当前的登录状态,11111111',isLogin.value) + if(isLogin.value){ + + uni.navigateBack({ + delta: 1 + }); + }else{ + uni.switchTab({ url: '/pages/merchant/index' }) + } + // uni.navigateBack({ + // uni.navigateBack({ + // delta: 1 + // }); + // }) }) return { @@ -168,7 +187,8 @@ export default { navTitle, isWx, getStorage, - clickLeft + clickLeft, + isLogin } } } \ No newline at end of file diff --git a/src/subPages/login/wxLogin/wxLogin.vue b/src/subPages/login/wxLogin/wxLogin.vue index b0bb8b7..23dfbf5 100644 --- a/src/subPages/login/wxLogin/wxLogin.vue +++ b/src/subPages/login/wxLogin/wxLogin.vue @@ -2,8 +2,11 @@ - - + + + + {{ navTitle }} +