From 467e130f7b0a04608a79f662dbedb8a97b5f36ff Mon Sep 17 00:00:00 2001 From: wtq <2394975549@qq.com> Date: Tue, 9 Dec 2025 17:46:55 +0800 Subject: [PATCH] =?UTF-8?q?'=E6=9B=B4=E6=8D=A2=E8=BD=AF=E8=91=97=E4=BA=AC?= =?UTF-8?q?=E8=A5=BF=E5=88=B0=E5=AE=B6'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.ts | 8 +- src/androidPrivacy.json | 4 +- .../version-update/varsion-update.nvue | 2 +- src/manifest.json | 12 +-- src/pages.json | 4 +- .../childPages/right-main/right-main.ts | 3 +- src/pages/message/index.ts | 2 + src/static/agreement/privacy.html | 14 +-- src/static/agreement/service.html | 102 +++++++++--------- src/subPages/agreement/updateVersion.vue | 4 +- src/subPages/login/addAuth/addAuth.vue | 4 +- src/subPages/login/index.vue | 2 +- src/subPages/login/weixin.ts | 28 ++--- src/subPages/login/wxLogin/wxLogin.ts | 28 ++--- src/subPages/login/wxLogin/wxLogin.vue | 4 +- .../backstageApp/backstageApp.vue | 2 +- .../setBusinessStatus/setBusinessStatus.ts | 4 +- .../setInvoiceEB/setInvoiceEB.ts | 2 +- src/subPages/merchantChild/setUp/setUp.ts | 12 +-- src/subPages/messageChild/msgChat/msgChat.ts | 26 ++++- .../msgChat/msgChatChild/chat-item.vue | 13 +++ src/utils/bluetoothPrinter/printerTemplate.ts | 4 +- src/utils/configCms.ts | 4 +- 23 files changed, 160 insertions(+), 128 deletions(-) diff --git a/src/App.ts b/src/App.ts index e5ae486..1096cf8 100644 --- a/src/App.ts +++ b/src/App.ts @@ -73,8 +73,8 @@ function App() { case 'android': const JModule = uni.requireNativePlugin('J-FrontService') JModule.startFrontService({ - title: '京西菜市', - content: '京西菜市正在运行', + title: '京西到家', + content: '京西到家正在运行', }) // 设置oppo通道 @@ -124,7 +124,7 @@ function App() { return 3 case '京东商城': return 5 - case '京西菜市': + case '京西到家': return 9 case '微盟': return 11 @@ -214,7 +214,7 @@ function App() { */ let isWait = false const watchAudio = (newData:string) => { - console.log(isWait,'isWait',newData) + // console.log(isWait,'isWait',newData) if(isWait) return // 阻止多个音频同时播放 if(newData){ const playVoid = uni.createInnerAudioContext() diff --git a/src/androidPrivacy.json b/src/androidPrivacy.json index 654485a..eead40d 100644 --- a/src/androidPrivacy.json +++ b/src/androidPrivacy.json @@ -2,12 +2,12 @@ "version" : "2", "prompt" : "template", "title" : "服务协议和隐私政策", - "message" : "　　请您务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向您提供服务，我们需要收集您的设备标识、操作日志等信息用于分析、优化应用性能。
　　您可阅读《服务协议》和《隐私政策》了解详细信息。如果您同意，请点击下面按钮开始接受我们的服务。", + "message" : "　　请您务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向您提供服务，我们需要收集您的设备标识、操作日志等信息用于分析、优化应用性能。
　　您可阅读《服务协议》和《隐私政策》了解详细信息。如果您同意，请点击下面按钮开始接受我们的服务。", "buttonAccept" : "同意并接受", "buttonRefuse" : "暂不同意", "second" : { "title" : "确认提示", - "message" : "　　进入应用前，您需先同意《用户协议》和《隐私政策》，否则将退出应用。", + "message" : "　　进入应用前，您需先同意《用户协议》和《隐私政策》，否则将退出应用。", "buttonAccept" : "同意并继续", "buttonRefuse" : "退出应用" } diff --git a/src/components/jx-update/update-cel/version-update/varsion-update.nvue b/src/components/jx-update/update-cel/version-update/varsion-update.nvue index 0a590cc..8f2c24a 100644 --- a/src/components/jx-update/update-cel/version-update/varsion-update.nvue +++ b/src/components/jx-update/update-cel/version-update/varsion-update.nvue @@ -316,7 +316,7 @@ function handleUpdate() { ID: 6, notifyType: 6, ticker: 'Ticker', - title: '京西菜市更新', + title: '京西到家更新', content: '正在下载', isSound: false, isVibrate: false, diff --git a/src/manifest.json b/src/manifest.json index cd6b3a5..c087354 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,9 +1,9 @@ { - "name" : "京西菜市商家版", + "name" : "京西到家商家版", "appid" : "__UNI__F9A47D3", "description" : "1、商户通过京西平台同时管理美团、饿了么、京东等多个外卖平台实现一键上架、下架、修改、删除多个平台商品；2、商户通过京西平台可以同时对、美团专送、达达、顺丰同城等多个专送平台召唤偶骑手", - "versionName" : "1.8.9", - "versionCode" : 189, + "versionName" : "1.9.0", + "versionCode" : 190, "transformPx" : false, "uni-app" : { "debug" : true @@ -165,9 +165,9 @@ "androidStyle" : "default", "iosStyle" : "storyboard", "android" : { - "hdpi" : "D:/wtq/交接文档new (2)/交接文档new/交接文档new/京西菜市商家版/素材/Android启动图/480x762.png", - "xhdpi" : "D:/wtq/交接文档new (2)/交接文档new/交接文档new/京西菜市商家版/素材/Android启动图/720x1242.png", - "xxhdpi" : "D:/wtq/交接文档new (2)/交接文档new/交接文档new/京西菜市商家版/素材/Android启动图/1080x1882.png" + "hdpi" : "C:/Users/Administrator/Desktop/授权书材料/京西到家480x762.png", + "xhdpi" : "C:/Users/Administrator/Desktop/授权书材料/京西到家720x1242.png", + "xxhdpi" : "C:/Users/Administrator/Desktop/授权书材料/京西到家1080x1882.png" }, "ios" : { "storyboard" : "D:/wtq/交接文档new (2)/交接文档new/交接文档new/京西菜市商家版/素材/ios启动图.zip" diff --git a/src/pages.json b/src/pages.json index cf2caaf..8aa3ed6 100644 --- a/src/pages.json +++ b/src/pages.json @@ -72,7 +72,7 @@ ], "globalStyle": { "navigationBarTextStyle": "black", - "navigationBarTitleText": "京西菜市", + "navigationBarTitleText": "京西到家", "navigationBarBackgroundColor": "#fff" }, "subPackages": [ @@ -117,7 +117,7 @@ { "path": "jxcs", "style": { - "navigationBarTitleText": "京西菜市" + "navigationBarTitleText": "京西到家" } }, { diff --git a/src/pages/goods-manager/childPages/right-main/right-main.ts b/src/pages/goods-manager/childPages/right-main/right-main.ts index 96058b6..483f265 100644 --- a/src/pages/goods-manager/childPages/right-main/right-main.ts +++ b/src/pages/goods-manager/childPages/right-main/right-main.ts @@ -3,8 +3,9 @@ import { store } from "@/store" import { getStorage } from "@/utils/storage" import toast from "@/utils/toast" import { jx_throttles, timeFormatD } from "@/utils/tools" -import { computed } from "@vue/reactivity" +// import { computed } from "@vue/reactivity" import configCms from "@/utils/configCms" +import { computed } from "vue" interface propType { skuName: AnyObject diff --git a/src/pages/message/index.ts b/src/pages/message/index.ts index 87ea21e..6101f2f 100644 --- a/src/pages/message/index.ts +++ b/src/pages/message/index.ts @@ -73,6 +73,7 @@ const messageFn = function () { // 获取美团IM async function getMTUserList() { + console.log('获取美团IM') let arr = await dataParams() if(!(arr && arr.length>0)) return let data = { @@ -82,6 +83,7 @@ const messageFn = function () { let ebStore = arr.find((item:AnyObject) => item.vendorID === '3') let res = await message.get_IM_user_list(data) + // res = msgInfo.userList // 模拟数据 if (res.code == 0) { if (JSON.stringify(res.data) === '{}') return diff --git a/src/static/agreement/privacy.html b/src/static/agreement/privacy.html index 32f6aca..4b5c78f 100644 --- a/src/static/agreement/privacy.html +++ b/src/static/agreement/privacy.html @@ -4,7 +4,7 @@ - 京西菜市用户隐私协议 + 京西到家商家版用户隐私协议