From e20284b81970cf389cf18899b27310330c298cc5 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Fri, 14 Feb 2025 13:42:20 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=BB=8F=E7=BA=AA=E4=BA=BA=E6=8F=90=E6=88=90?=
=?UTF-8?q?=E5=BA=94=E6=8C=89=E7=BB=8F=E7=BA=AA=E4=BA=BA=E7=AD=89=E7=BA=A7?=
=?UTF-8?q?=E8=AE=BE=E5=AE=9A=EF=BC=8C=E5=B9=B6=E5=9C=A8=E7=BB=8F=E7=BA=AA?=
=?UTF-8?q?=E4=BA=BA=E6=95=B0=E6=8D=AE=E5=92=8C=E5=AE=A2=E6=88=B7=E7=AB=AF?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=BB=8F=E7=BA=AA=E4=BA=BA=E7=AD=89=E7=BA=A7?=
=?UTF-8?q?=E5=92=8C=E6=8F=90=E6=88=90=E6=AF=94=E4=BE=8B2.=E7=B4=AF?=
=?UTF-8?q?=E8=AE=A1=E8=8E=B7=E5=BE=97=E4=BD=A3=E9=87=91=E5=8F=AF=E6=9F=A5?=
=?UTF-8?q?=E7=9C=8B=E4=BD=A3=E9=87=91=E6=98=8E=E7=BB=861.=E5=AE=A2?=
=?UTF-8?q?=E6=88=B7=E7=AB=AF=E7=94=B3=E8=AF=B7=E6=8F=90=E4=BA=A4=E5=90=8E?=
=?UTF-8?q?=E5=BA=94=E6=98=BE=E7=A4=BA=E7=AD=89=E5=BE=85=E5=AE=A1=E6=89=B9?=
=?UTF-8?q?2.=E5=90=8E=E5=8F=B0=E5=8F=AF=E7=9B=B4=E6=8E=A5=E7=9C=8B?=
=?UTF-8?q?=E5=88=B0=E7=94=B3=E8=AF=B7=E4=BF=A1=E6=81=AF=E5=8F=AF=E7=9B=B4?=
=?UTF-8?q?=E6=8E=A5=E6=8E=88=E6=9D=83=E9=80=9A=E8=BF=873.=E6=B8=A0?=
=?UTF-8?q?=E9=81=93=E6=98=8E=E7=BB=86=E6=98=AF=E6=94=B6=E5=85=A5=E6=98=8E?=
=?UTF-8?q?=E7=BB=86=EF=BC=8C=E6=88=91=E7=9A=84=E6=B8=A0=E9=81=93=E5=95=86?=
=?UTF-8?q?=E6=98=AF=E7=BB=91=E5=AE=9A=E7=9A=84=E4=B8=8B=E5=B1=9E=E6=B8=A0?=
=?UTF-8?q?=E9=81=93=E5=95=86=E8=80=8C=E4=B8=8D=E6=98=AF=E6=8A=80=E5=B8=88?=
=?UTF-8?q?=EF=BC=8C=E8=A2=AB=E7=BB=91=E5=AE=9A=E7=9A=84=E6=B8=A0=E9=81=93?=
=?UTF-8?q?=E5=95=86=E5=8F=AF=E7=9C=8B=E5=88=B0=E6=B8=A0=E9=81=93=E5=95=86?=
=?UTF-8?q?=E7=9A=84=E6=8F=90=E6=88=90=E6=AF=94=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/config.js | 13 +-
common/queue.js | 4 +-
components/tki-qrcode/tki-qrcode.vue | 2 +
components/wm-poster/wm-posterorders.vue | 3 +-
index.html | 4 +-
manifest.json | 6 +-
pages/msg/im.vue | 1 -
pages/my/applyBroker/myBroker.vue | 165 ++++++++++++------
.../my/applySalesperson/channelMerchants.vue | 28 ++-
pages/my/applySalesperson/index.vue | 7 +-
pages/my/applySalesperson/mySalesperson.vue | 2 +-
uview-ui/libs/request/index.js | 1 -
12 files changed, 157 insertions(+), 79 deletions(-)
diff --git a/common/config.js b/common/config.js
index a4f3d4e..5a64acf 100644
--- a/common/config.js
+++ b/common/config.js
@@ -1,16 +1,12 @@
-const ROOTPATH3 = "wss://192.168.2.22:8187/wss/chatSocket/";
+// const ROOTPATH3 = "wss://192.168.2.22:8187/wss/chatSocket/";
const ROOTPATH = "http://192.168.2.22:8187/sqx_fast";
-const ROOTPATH1 = "http://192.168.2.22:8187/sqx_fast";
-
-// const ROOTPATH3 = "wss://sausers.blxinchuang.com/wss/chatSocket/";
-// const ROOTPATH = "https://sausers.blxinchuang.com/sqx_fast";
-// const ROOTPATH1 = "https://sausers.blxinchuang.com/sqx_fast";
+// const ROOTPATH1 = "http://192.168.2.22:8187/sqx_fast";
//生产环境
// const ROOTPATH = "https://admin.sjajk.com/sqx_fast";//生产需替换
-// const ROOTPATH1 = "https://admin.sjajk.com/sqx_fast";//生产需替换
-// const ROOTPATH3 = "wss://admin.sjajk.com/wss/chatSocket/"; //联系客服//生产需替换
+const ROOTPATH1 = "https://admin.sjajk.com/sqx_fast";//生产需替换
+const ROOTPATH3 = "wss://admin.sjajk.com/wss/chatSocket/"; //联系客服//生产需替换
//上传地址
const UPLOAD_PATH = ROOTPATH1 + '/alioss/upload';
@@ -22,7 +18,6 @@ const TX_MAP_KEY = 'VIWBZ-5OM3F-CV7JZ-NLKJY-AXSYV-TMFM6';
//ws基础连接地址
// const WS_BASE_PATH = 'ws://192.168.2.222:8187/sqx_fast/';
-// const WS_BASE_PATH = 'ws://sausers.blxinchuang.com/sqx_fast/';
const WS_BASE_PATH = 'wss://admin.sjajk.com/sqx_fast/';//生产需替换
//地图ws接口
diff --git a/common/queue.js b/common/queue.js
index 2be8057..fb01bbd 100644
--- a/common/queue.js
+++ b/common/queue.js
@@ -19,13 +19,11 @@ module.exports = {
//全局域名 部分html中需要单独替换 需要修改config中的网络请求域名
publicYuMing() {
return 'https://admin.sjajk.com'//生产需替换
- // return 'https://sausers.blxinchuang.com'
// return 'http://192.168.2.222:8187'
},
//全局域名 部分html中需要单独替换 需要修改config中的网络请求域名
publicYuMingApp() {
- return 'https://admin.sjajk.com'//生产需替换
- // return 'https://sausers.blxinchuang.com'
+ return 'https://wx.sjajk.com'//生产需替换
// return 'http://192.168.2.222:8187'
},
logout() {
diff --git a/components/tki-qrcode/tki-qrcode.vue b/components/tki-qrcode/tki-qrcode.vue
index e3a6cc6..12baf03 100644
--- a/components/tki-qrcode/tki-qrcode.vue
+++ b/components/tki-qrcode/tki-qrcode.vue
@@ -83,6 +83,7 @@ export default {
},
methods: {
_makeCode() {
+ console.log(8989898,this)
let that = this
if (!this._empty(this.val)) {
qrcode = new QRCode({
@@ -99,6 +100,7 @@ export default {
image: that.icon, // 二维码图标
imageSize: that.iconSize,// 二维码图标大小
cbResult: function (res) { // 生成二维码的回调
+ console.log(987,res)
that._result(res)
},
});
diff --git a/components/wm-poster/wm-posterorders.vue b/components/wm-poster/wm-posterorders.vue
index 198bad1..b8eae9a 100644
--- a/components/wm-poster/wm-posterorders.vue
+++ b/components/wm-poster/wm-posterorders.vue
@@ -227,7 +227,8 @@
canvasId: _this.CanvasID,
quality: 1,
complete: res => {
- _this.tempFilePath = res.tempFilePath;
+ console.log(321321,_this.tempFilePath)
+ // _this.tempFilePath = res.tempFilePath;
_this.$emit('success', res);
_this.loading = false;
_this.$queue.showToast('长按图片保存海报');
diff --git a/index.html b/index.html
index 762dcc9..223e938 100644
--- a/index.html
+++ b/index.html
@@ -20,8 +20,8 @@