Merge branch 'master' into 国际化

# Conflicts:
#	packageA/betweenFee/modules/list/index.wxml
#	pages/login/modules/agreement.js
#	pages/login/modules/agreement.scss
#	pages/login/modules/agreement.wxml
#	pages/login/modules/login.js
#	pages/login/modules/phone.js
#	pages/login/modules/phone.wxml
#	pages/login/phone.js
#	pages/login/phone.json
#	pages/login/phone.wxml
#	pages/login/selectSite.js

packageA/betweenFee/index.js

@@ -45,7 +45,7 @@ Page({
         if (init) content.pageNumber = 1;
         if (content.pageNumber > content.pageTotal) return;
         _Http.basic({
-            "id": 20230104194002,
+            "id": 20240926150804,
             content
         }).then(res => {
             console.log("订单列表", res)

packageA/betweenFee/modules/list/index.wxml

@@ -4,29 +4,23 @@
     </view>
     <view class="content">
         <view class="num">
-            {{language['单号']||'单号'}}：{{item.sonum}}
+            {{language['单号']||'单号'}}：{{item.billno}}
         </view>
         <view class="exp">
-            {{language['单据号(订单/退货单)']||'单据号(订单/退货单)'}}：{{item.billno || '--'}}
+            {{language['单据号(订单/退货单)']||'单据号(订单/退货单)'}}：{{item.sonum || '--'}}
         </view>
         <view class="exp">
             {{language['居间合同号']||'居间合同号'}}：{{item.billno_contract || '--'}}
         </view>
         <view class="amount">
-            {{language['居间费']||'居间费'}}:￥{{item.rebate || '--'}}{{language['元']||'元'}}
+            {{language['居间费']||'居间费'}}:￥{{item.rebate || '0'}}{{language['元']||'元'}}
         </view>
         <view class="exp">
             {{language['备注']||'备注'}}{{item.remarks || '--'}}
         </view>
     </view>
-
-    <view wx:if="{{item.contacts.length}}" class="bottom line-1">
-        <text style="margin-right: 10rpx;">{{item.contacts[0].name}}</text>
-        <text style="margin-right: 10rpx;">{{item.contacts[0].phonenumber}}</text>
-        <text style="margin-right: 10rpx;">{{item.contacts[0].address}}</text>
-    </view>
-    <view wx:else class="bottom">
-        {{language['暂无更多信息']||'暂无更多信息'}}
+    <view class="bottom">
+        {{language['居间商']||'居间商'}}：{{item.enterprisename ||  '--'}}
     </view>
 </navigator>
 

pages/login/modules/account.js

@@ -24,6 +24,7 @@ Component({
             setTimeout(() => {
                 this.allowOrNot();
             }, 100)
+            getApp().globalData.Language.getLanguagePackage(this)
         }
     },
     methods: {

pages/login/modules/agreement.js

@@ -1,56 +0,0 @@
-Component({
-    properties: {
-        isAgree: {
-            type: Boolean
-        },
-        callBack: {
-            type: Function
-        },
-        language: {
-            type: Object,
-            value: {}
-        }
-    },
-    methods: {
-        /* 修改授权 */
-        isAgreeChange() {
-            let isAgree = !this.data.isAgree
-            this.setData({
-                isAgree
-            })
-            this.triggerEvent("callBack", isAgree);
-            wx.setStorageSync('isAgree', isAgree);
-        },
-        checkTheAgreement() {
-            wx.showLoading({
-                title: '加载中...',
-            })
-            wx.downloadFile({
-                url: 'https://yossys80658.obs.cn-east-2.myhuaweicloud.com/system/E%E8%AE%A2%E5%8D%95%E9%9A%90%E7%A7%81%E4%BF%9D%E6%8A%A4.docx',
-                success: (res) => {
-                    wx.openDocument({
-                        filePath: res.tempFilePath,
-                        success: (s) => {
-                            wx.hideLoading();
-
-                        },
-                        fail: (err) => {
-                            wx.hideLoading();
-                            wx.showToast({
-                                title: '读取失败,请稍后再试',
-                                icon: "none"
-                            })
-                        }
-                    })
-                },
-                fail: (err) => {
-                    wx.hideLoading();
-                    wx.showToast({
-                        title: '读取失败,请稍后再试',
-                        icon: "none"
-                    })
-                }
-            })
-        }
-    }
-})

pages/login/modules/agreement.json

@@ -1,6 +0,0 @@
-{
-    "component": true,
-    "usingComponents": {
-        "van-checkbox": "@vant/weapp/checkbox/index"
-    }
-}

pages/login/modules/agreement.scss

@@ -1,19 +0,0 @@
-/* 登录协议 */
-.agreement {
-    display: flex;
-    width: 100%;
-    justify-content: center;
-
-    .con {
-        width: 316rpx;
-        text-align: center;
-        font-size: 24rpx !important;
-        font-family: PingFang SC-Regular, PingFang SC;
-        color: #666666 !important;
-        margin-left: -20rpx;
-
-        text {
-            color: #3874F6;
-        }
-    }
-}

pages/login/modules/agreement.wxml

@@ -1,3 +0,0 @@
-<view class="agreement">
-    <van-checkbox icon-size="28rpx" label-class='con' value="{{ isAgree }}" bind:change="isAgreeChange">{{language['已阅读并且同意']||'已阅读并同意'}}<text catchtap="checkTheAgreement">《{{language['隐私协议']||'隐私协议'}}》</text></van-checkbox>
-</view>

pages/login/modules/login.js

@@ -1,20 +1,21 @@
 function loginMsg(res) {
-    wx.removeStorageSync('auth')
-    wx.removeStorageSync('userauth');
-    wx.removeStorageSync('siteP');
-    wx.removeStorageSync('banner_list');
-    wx.removeStorageSync('templetList');
-    wx.setStorageSync('account_list', res.account_list);
-    if (res.account_list.length == 1) {
-        wx.setStorageSync('userrole', res.account_list[0].usertype == 1 ? '业务员' : '经销商');
-        wx.removeStorageSync('userMsg')
-        wx.setStorageSync('userMsg', res.account_list[0])
-        init();
-    } else {
-        wx.redirectTo({
-            url: './selectSite',
-        })
-    }
+	wx.removeStorageSync('auth')
+	wx.removeStorageSync('userauth');
+	wx.removeStorageSync('siteP');
+	wx.removeStorageSync('banner_list');
+	wx.removeStorageSync('templetList');
+	wx.setStorageSync('isAgree', true)
+	wx.setStorageSync('account_list', res.account_list);
+	if (res.account_list.length == 1) {
+		wx.setStorageSync('userrole', res.account_list[0].usertype == 1 ? '业务员' : '经销商');
+		wx.removeStorageSync('userMsg')
+		wx.setStorageSync('userMsg', res.account_list[0])
+		init();
+	} else {
+		wx.redirectTo({
+			url: './selectSite',
+		})
+	}
 }
 
 function init() {

pages/login/modules/phone.js

@@ -1,4 +1,8 @@
-let downCount = null;
+let loginMsg = require("./login"),
+    md5 = require("../../../utils/md5"),
+    _Http = getApp().globalData.http,
+    deleteMark = require("../../../utils/Check"),
+    downCount = null;
 
 Component({
     properties: {
@@ -14,7 +18,8 @@ Component({
         phonenumber: '',
         password: '',
         showText: "获取验证码",
-        memory: true
+        memory: true,
+        focus: false
     },
     lifetimes: {
         attached: function () {
@@ -25,14 +30,18 @@ Component({
             setTimeout(() => {
                 this.allowOrNot();
             }, 100)
+            getApp().globalData.Language.getLanguagePackage(this)
         }
     },
     methods: {
         /* 获取验证码 */
         getPassword() {
+            this.setData({
+                focus: false
+            })
             if (this.data.showText != "获取验证码") return;
-            if (!require("../../../utils/Check").CheckPhoneNumber(this.data.phonenumber)) return;
-            getApp().globalData.http.getpassword({
+            if (!deleteMark.CheckPhoneNumber(this.data.phonenumber)) return;
+            _Http.getpassword({
                 "phonenumber": this.data.phonenumber,
                 "systemclient": "wechatsaletool"
             }).then(res => {
@@ -43,7 +52,8 @@ Component({
                 })
                 if (res.code != 1) return;
                 this.setData({
-                    showText: 30
+                    showText: 30,
+                    focus: true
                 })
                 downCount = setInterval(() => {
                     let showText = this.data.showText;

pages/login/modules/phone.wxml

@@ -4,9 +4,9 @@
 </van-cell>
 <van-cell>
     <text slot='icon' class="iconfont icon-a-biaoqianlanxiaoxixuanzhong" />
-    <input class="input" type="number" bindinput="inputChange" data-name="password" value="{{password}}" placeholder="{{language['验证码'] || '请输入验证码'}}" />
-    <view slot='right-icon' class="right-icon" catchtap="getPassword">
-        {{showText=='获取验证码' ? (language[showText] || '获取验证码') : showText + 's'}}
+    <input class="input" focus='{{focus}}' type="number" bindinput="inputChange" data-name="password" value="{{password}}" placeholder="{{language['请输入验证码']||'请输入验证码'}}" />
+    <view slot='right-icon' class="right-icon" style="opacity:{{phonenumber.length==11?'1':'.5'}} ;" catchtap="{{phonenumber.length==11?'getPassword':''}}">
+        {{showText=='获取验证码'?language[showText]||showText:language[showText]||showText+'s'}}
     </view>
 </van-cell>
 <view class="box">

pages/login/phone.js

@@ -1,107 +1,146 @@
-import Toast from '@vant/weapp/toast/toast';
-
 Page({
-    data: {
-        isAgree: false,
-        disabled: true, //是否禁用
-        loading: false, //登陆中
-        languages: [],
-    },
-    async onLoad() {
-        if (wx.getStorageSync('isAgree')) this.setData({
-            isAgree: wx.getStorageSync('isAgree')
-        })
-        this.setData({
-            devCount: 0,
-        })
-        getApp().globalData.http.base({
-            id: "10026401",
-            content: {}
-        }).then(res => {
-            console.log("语言包列表", res)
-            if (res.code == '1') {
-                let item = res.data.find(v => v.languagecode == (wx.getStorageSync('languagecode')))
-                console.log("item", item)
-                this.setData({
-                    languages: res.data,
-                    languagename: item.languagename || '简体中文',
-                    rowIndex: item.rowindex - 1
-                })
-                this.changeTitle();
-            }
-        })
-        this.changeTitle()
-    },
-    changeLanguages(e) {
-        let item = this.data.languages[e.detail.value];
-        getApp().globalData.Language.getLanguages(item.languagecode).then(res => {
-            this.setData({
-                language: res,
-                languagename: item.languagename || '简体中文',
-                rowIndex: item.rowindex - 1
-            })
-            this.changeTitle();
-        })
-    },
-    changeTitle() {
-        getApp().globalData.Language.getLanguagePackage(this, '账户登录');
-    },
-    /* 微信登录 */
-    wechatLogin() {
-        if (!this.data.isAgree) return Toast({
-            message: getApp().globalData.Language.getMapText("确认用户协议") || '请阅读并勾选用户协议',
-            position: 'bottom'
-        });
-        wx.login({
-            success(res) {
-                if (res.code) {
-                    getApp().globalData.http.loginbywechat({
-                        wechat_code: res.code,
-                        "systemclient": "wechatsaletool"
-                    }).then(res => {
-                        console.log("微信快捷登录", res)
-                        if (res.code == 0) return wx.showToast({
-                            title: res.msg,
-                            icon: "none"
-                        })
-                        require("./modules/login").loginMsg(res);
-                        getApp().globalData.remindchangepassword = res.remindchangepassword == 1;
-                    })
-                } else {
-                    console.log('登录失败！' + res.errMsg)
-                }
-            }
-        })
-    },
-    /* 用户登录 */
-    userLogin() {
-        if (this.data.loading || this.data.disabled) return;
-        if (!this.data.isAgree) return Toast({
-            message: getApp().globalData.Language.getMapText("确认用户协议") || '请阅读并勾选用户协议',
-            position: 'bottom'
-        });
-        this.setData({
-            loading: true
-        })
-        this.selectComponent('#login').handleLogin();
-    },
-    /* 授权 */
-    agreementChange({
-        detail
-    }) {
-        this.setData({
-            isAgree: detail
-        })
-    },
-    todev() {
-        if (this.data.devCount == 5) {
-            wx.navigateTo({
-                url: '/pages/login/developerTools',
-            })
-            this.data.devCount = 0;
-        } else {
-            this.data.devCount += 1;
-        }
-    },
-    onShareAppMessage() {}
+	data: {
+		isAgree: false,
+		disabled: true, //是否禁用
+		loading: false, //登陆中
+		register: null,
+		languages: [],
+		showDialog: false
+	},
+	async onLoad() {
+		if (wx.getStorageSync('isAgree')) this.setData({
+			isAgree: wx.getStorageSync('isAgree')
+		})
+		this.setData({
+			devCount: 0,
+		})
+		getApp().globalData.http.base({
+			id: "10026401",
+			content: {}
+		}).then(res => {
+			console.log("语言包列表", res)
+			if (res.code == '1') {
+				let item = res.data.find(v => v.languagecode == (wx.getStorageSync('languagecode')))
+				console.log("item", item)
+				this.setData({
+					languages: res.data,
+					languagename: item.languagename || '简体中文',
+					rowIndex: item.rowindex - 1
+				})
+				this.changeTitle();
+			}
+		})
+		getApp().globalData.Language.getLanguagePackage(this, '账户登录');
+	},
+	changeLanguages(e) {
+		let item = this.data.languages[e.detail.value];
+		getApp().globalData.Language.getLanguages(item.languagecode).then(res => {
+			this.setData({
+				language: res,
+				languagename: item.languagename || '简体中文',
+				rowIndex: item.rowindex - 1
+			})
+			this.changeTitle();
+		})
+	},
+	changeTitle() {
+		getApp().globalData.Language.setNavBarTitle('账户登录')
+	},
+	/* 修改授权 */
+	isAgreeChange() {
+		let isAgree = !this.data.isAgree
+		this.setData({
+			isAgree
+		})
+		wx.setStorageSync(isAgree)
+	},
+	/* 查看隐私协议 */
+	checkTheAgreement() {
+		wx.showLoading({
+			title: getApp().globalData.Language.getMapText('加载中...'),
+		})
+		wx.downloadFile({
+			url: 'https://yossys80658.obs.cn-east-2.myhuaweicloud.com/system/E%E8%AE%A2%E5%8D%95%E9%9A%90%E7%A7%81%E4%BF%9D%E6%8A%A4.docx',
+			success: (res) => {
+				wx.openDocument({
+					filePath: res.tempFilePath,
+					success: (s) => {
+						wx.hideLoading();
+					},
+					fail: (err) => {
+						wx.hideLoading();
+						getApp().globalData.Language.showToast('读取失败,请稍后再试')
+					}
+				})
+			},
+			fail: (err) => {
+				wx.hideLoading();
+				getApp().globalData.Language.showToast('读取失败,请稍后再试')
+			}
+		})
+	},
+	/* 微信登录 */
+	wechatLogin() {
+		if (this.data.loading) return
+		if (!this.data.isAgree) {
+			this.data.register = this.wechatLogin
+			this.setData({
+				showDialog: true
+			})
+			return
+		}
+		wx.login({
+			success(res) {
+				if (res.code) {
+					getApp().globalData.http.loginbywechat({
+						wechat_code: res.code,
+						"systemclient": "wechatsaletool"
+					}).then(res => {
+						console.log("微信快捷登录", res)
+						if (res.code == 0) return wx.showToast({
+							title: getApp().globalData.Language.getMapText('res.msg'),
+							icon: "none"
+						})
+						require("./modules/login").loginMsg(res);
+						getApp().globalData.remindchangepassword = res.remindchangepassword == 1;
+					})
+				} else {
+					console.log('登录失败！' + res.errMsg)
+				}
+			}
+		})
+	},
+	/* 用户登录 */
+	userLogin() {
+		if (this.data.loading || this.data.disabled) return;
+		if (!this.data.isAgree) {
+			this.data.register = this.userLogin
+			this.setData({
+				showDialog: true
+			})
+			return
+		}
+		this.setData({
+			loading: true
+		})
+		this.selectComponent('#login').handleLogin();
+	},
+	onConfirm() {
+		this.setData({
+			showDialog: false,
+			isAgree: true
+		})
+		this.data.register()
+	},
+	todev() {
+		if (this.data.devCount == 5) {
+			wx.navigateTo({
+				url: '/pages/login/developerTools',
+			})
+			this.data.devCount = 0;
+		} else {
+			this.data.devCount += 1;
+		}
+	},
+	onShareAppMessage() {}
 })

pages/login/phone.json

@@ -1,9 +1,10 @@
 {
     "navigationBarTitleText": "账户登录",
     "usingComponents": {
-        "Agreement": "./modules/agreement",
         "van-divider": "@vant/weapp/divider/index",
         "account": "./modules/account",
-        "phone": "./modules/phone"
+        "phone": "./modules/phone",
+        "van-dialog": "@vant/weapp/dialog/index",
+        "van-checkbox": "@vant/weapp/checkbox/index"
     }
 }

pages/login/phone.scss

@@ -30,4 +30,36 @@ page {
     font-size: 28rpx;
     font-family: PingFang SC-Regular, PingFang SC;
     color: #FFFFFF;
+}
+
+.dialog {
+    display: flex;
+    justify-content: center;
+    padding: 80rpx 0;
+
+    .navigator {
+        color: var(--assist);
+        font-weight: bold;
+    }
+}
+
+/* 登录协议 */
+.agreement {
+    display: flex;
+    width: 100%;
+    justify-content: center;
+
+    .con {
+        width: 316rpx;
+        text-align: center;
+        font-size: 24rpx !important;
+        font-family: PingFang SC-Regular, PingFang SC;
+        color: #666666 !important;
+        margin-left: -20rpx;
+
+        text {
+            color: #3874F6;
+            font-weight: bold;
+        }
+    }
 }

pages/login/phone.wxml

@@ -3,16 +3,16 @@
 </view>
 
 <!-- 手机号登录  -->
-<!-- <phone id='login' language='{{language}}' /> -->
+<!-- <phone id='login' /> -->
 <!-- 账号登录 -->
-<account id='login' language='{{language}}' />
+<account id='login' />
 <view style="width: 100vw; text-align: center;margin-top: 60rpx;margin-bottom: 40rpx;">
 	<van-button disabled='{{disabled}}' custom-class='login' bindtap="userLogin" loading='{{loading}}' loading-text="{{language['登录中']||'登录中'}}..." color='linear-gradient(90deg, #3874F6 0%, #095DE0 100%);'>{{language['登录']||'登录'}}</van-button>
 </view>
-
 <!-- 隐私协议 -->
-<Agreement isAgree='{{isAgree}}' language='{{language}}' bindcallBack='agreementChange' />
-
+<view class="agreement">
+	<van-checkbox icon-size="28rpx" label-class='con' value="{{ isAgree }}" bind:change="isAgreeChange"> {{language['已阅读并同意']||'已阅读并同意'}}<text catchtap="checkTheAgreement">《{{language['隐私协议']||'隐私协议'}}》</text></van-checkbox>
+</view>
 <!-- 快捷登录 -->
 <block>
 	<view style="height: 100rpx;" />
@@ -22,10 +22,14 @@
 	</view>
 </block>
 
-<van-toast id="van-toast" />
-
 <view style="text-align: center; margin-top: 20px;">
 	<picker mode="selector" range="{{languages}}" range-key='languagename' value="{{rowIndex}}" bindchange='changeLanguages'>
 		{{languagename}}
 	</picker>
-</view>
+</view>
+
+<van-dialog use-slot show='{{ showDialog }}' confirmButtonText="{{language['同意并获取']||'同意并获取'}}" cancelButtonText="{{language['取消']||'取消'}}"  confirm-button-color='var(--assist)' show-cancel-button bind:confirm='onConfirm'>
+	<view class="dialog">
+		{{language['请阅读并同意']||'请阅读并同意'}} <navigator class="navigator" url="#" bind:tap="checkTheAgreement">《{{language['隐私协议']||'隐私协议'}}》</navigator>
+	</view>
+</van-dialog>

pages/login/selectSite.js

@@ -1,7 +1,46 @@
+let _Http = getApp().globalData.http
+
 Page({
     data: {
         account_list: []
     },
+    onLoad(options) {
+        for (var key in options) {
+            if (key.length > 30 && key.includes("_")) {
+                let value = key.split("_")
+                wx.setNavigationBarTitle({
+                    title: getApp().globalData.Language.getMapText('加载中...'),
+                })
+                _Http.appName = value[1];
+                _Http.base({
+                    "id": 2024092514364201,
+                    accesstoken: value[0]
+                }).then(res => {
+                    console.log('通过token获取登录数据', res);
+                    if (res.code != 1) {
+                        wx.showToast({
+                            title: res.msg,
+                            icon: "none",
+                            mask: true
+                        })
+                        setTimeout(() => {
+                            wx.redirectTo({
+                                url: '/pages/login/phone',
+                            })
+                        }, 500);
+                        return
+                    }
+                    wx.setStorageSync('userMsg', res.data);
+                    wx.setStorageSync('account_list', [res.data])
+                    wx.setStorageSync('userrole', res.data.usertype == 1 ? '业务员' : '经销商');
+                    require('./modules/login').init();
+                })
+            }
+        }
+        this.setData({
+            account_list: wx.getStorageSync('account_list')
+        })
+    },
     toHome(e) {
         wx.removeStorageSync('userMsg')
         wx.setStorageSync('userMsg', e.currentTarget.dataset.item);

project.private.config.json

@@ -5,6 +5,6 @@
     "compileHotReLoad": true,
     "urlCheck": false
   },
-  "libVersion": "2.29.2",
+  "libVersion": "3.6.1",
   "condition": {}
 }

utils/Http.js

@@ -6,12 +6,12 @@ class HTTP {
             url: "https://oms.idcgroup.com.cn:8079"
         }, {
             name: "开发环境",
-            url: "http://61.164.207.46:8003"
+            url: "http://61.164.207.46:8000"
         }]
         if (this.ENV === 'release') { // 正式版
             this.baseUrl = "https://oms.idcgroup.com.cn:8079";
         } else {
-            this.baseUrl = "http://61.164.207.46:8003";
+            this.baseUrl = "http://61.164.207.46:8000";
             // this.baseUrl = "https://oms.idcgroup.com.cn:8079";
         }
 
@@ -50,7 +50,7 @@ class HTTP {
     }
     _request(url, resolve, reject, data, method, header, loading) {
         /* if (loading) wx.showLoading({
-            title: '加载中...',
+            title: getApp().globalData.Language.getMapText('加载中...'),
             mask: true
         }) */
         if (data.method && data.method != "query_userauth") data.languagecode = wx.getStorageSync('languagecode') || 'ZH'
@@ -64,14 +64,20 @@ class HTTP {
             fial: err => reject(err),
             complete: (res) => {
                 // if (loading) wx.hideLoading()
+                if (res.data.code != 1) {
+                    console.error("错误的请求", {
+                        request: data,
+                        result: res.data
+                    })
+                }
                 if (res.errMsg != 'request:ok') {
                     wx.showToast({
                         title: getApp().globalData.Language.getMapText('网络异常，请重新进入'),
                         icon: "none"
                     })
-                } else if (res.data.msg == '登陆状态已过期，请重新登陆！') {
+                } else if (res.data.msg == '登陆状态已过期，请重新登陆！' || res.data.msg == getApp().globalData.Language.getMapText('登陆状态已过期，请重新登陆！')) {
                     wx.showToast({
-                        title: res.data.msg,
+                        title: getApp().globalData.Language.getMapText(res.data.msg),
                         icon: "none",
                         mask: true
                     })

utils/work/apps.js

@@ -42,6 +42,7 @@ function getapps() {
 				let i = paths.findIndex(k => k.name == s.meta.title);
 				if (i != -1) {
 					paths[i].index = i;
+					paths[i].appName = s.name;
 					list.push(paths[i])
 				}
 			}
@@ -186,6 +187,7 @@ function getcrm() {
 				let i = paths.findIndex(k => k.name == s.meta.title);
 				if (i != -1) {
 					paths[i].index = i;
+					paths[i].appName = s.name;
 					list.push(paths[i])
 				}
 			}
@@ -277,6 +279,7 @@ function getedd() {
 				let i = paths.findIndex(k => k.name == s.meta.title);
 				if (i != -1) {
 					paths[i].index = i;
+					paths[i].appName = s.name;
 					list.push(paths[i])
 				}
 			}
@@ -319,6 +322,7 @@ function geteservice() {
 				let i = paths.findIndex(k => k.name == s.meta.title);
 				if (i != -1) {
 					paths[i].index = i;
+					paths[i].appName = s.name;
 					list.push(paths[i])
 				}
 			}
@@ -375,6 +379,12 @@ function dye(list) {
 		bColor: "#F4FAEF",
 	}];
 	return list.map((v, i) => {
+		if (getApp().globalData.http.appName && v.appName == getApp().globalData.http.appName) {
+			wx.navigateTo({
+				url: v.path
+			})
+			delete getApp().globalData.http.appName
+		}
 		return {
 			...v,
 			...colorList[i > colorList.length - 1 ? i - colorList.length : i]

utils/work/work.js

@@ -62,7 +62,7 @@ function isHistory() {
             url,
             success(res) {
                 wx.showToast({
-                    title: '已恢复页面',
+                    title: getApp().globalData.Language.getMapText('已恢复页面'),
                     icon: "none"
                 });
                 getApp().globalData.LaunchOptions = null;