diff --git a/app.js b/app.js index 800c98f..aadec68 100644 --- a/app.js +++ b/app.js @@ -14,6 +14,12 @@ App({ username: '441785369@qq.com', password: 'Sj89061189' }; + const conf = wx.getStorageSync('conf') || {}; + conf.odooUrl = this.globalData.odooUrl; + conf.db = this.globalData.db; + conf.username = this.globalData.username; + // conf.password = this.globalData.password; + wx.setStorageSync('conf', conf) // 登录 wx.login({ success: res => { diff --git a/pages/logs/logs.js b/pages/logs/logs.js index 85f6aac..1bbf15c 100644 --- a/pages/logs/logs.js +++ b/pages/logs/logs.js @@ -3,7 +3,8 @@ const util = require('../../utils/util.js') Page({ data: { - logs: [] + logs: [], + conf: [] }, onLoad() { this.setData({ @@ -12,7 +13,21 @@ Page({ date: util.formatTime(new Date(log)), timeStamp: log } - }) + }), + conf: wx.getStorageSync('conf') || {} }) + }, + clearStorageSync() { + wx.clearStorageSync(); + wx.showToast({ + title: '缓存已清除', + icon: 'success', + duration: 2000 + }); + // 清除缓存后,可以重新加载数据或重置页面状态 + this.setData({ + logs: [], + conf: {} + }); } }) diff --git a/pages/logs/logs.wxml b/pages/logs/logs.wxml index 85cf1bf..8a916b6 100644 --- a/pages/logs/logs.wxml +++ b/pages/logs/logs.wxml @@ -1,6 +1,10 @@ + {{index + 1}}. {{log.date}} + {{index + 1}}. {{conf.username}} + {{index + 1}}. {{conf.db}} + {{index + 1}}. {{conf.odooUrl}} diff --git a/pages/sale_order/sale_order.js b/pages/sale_order/sale_order.js index cacec60..01e234b 100644 --- a/pages/sale_order/sale_order.js +++ b/pages/sale_order/sale_order.js @@ -125,10 +125,12 @@ Page({ product_ids = product_ids.map(idObj => idObj.int?._text); } - // 提取 partner_id - const partner_id = item.struct.member.find(member => member.name._text === 'partner_id')?.value.array?.data?.value[0]?.int?._text || ''; + // 提取 partner_id 和 partner_name + const partnerInfo = item.struct.member.find(member => member.name._text === 'partner_id')?.value.array?.data?.value; + const partner_id = partnerInfo?.[0]?.int?._text || ''; + const partner_name = partnerInfo?.[1]?.string?._text || ''; - return { id, name, orde_ddje, date_order, product_ids, partner_id }; + return { id, name, orde_ddje, date_order, product_ids, partner_id, partner_name }; }); console.log('Data fetched successfully:', partners); @@ -162,6 +164,7 @@ Page({ }); }); }, + /** * 创建一个函数来进行 XML-RPC 请求 */ @@ -287,6 +290,7 @@ Page({ 订单金额: ${partner.orde_ddje} 产品: ${productNames} 合作伙伴ID: ${partner.partner_id || '无'} + 合作伙伴名称: ${partner.partner_name || '无'} `; }, diff --git a/pages/sale_order/sale_order.wxml b/pages/sale_order/sale_order.wxml index 3b3d837..f7c8416 100644 --- a/pages/sale_order/sale_order.wxml +++ b/pages/sale_order/sale_order.wxml @@ -7,7 +7,7 @@ num="{{item.date_order || '日期'}}" tag="{{index}}" price="{{item.orde_ddje || '0.00'}}" - desc="{{item.partner_id|| '描述信息'}}" + desc="{{item.partner_name|| '描述信息'}}" bind:tap="onCardClick" bind:click-thumb="onThumbClick" title="{{item.name || '商品标题'}}"