Commit b83f92d1 authored by 刘燕芳's avatar 刘燕芳

1

parent 22d1556d
No preview for this file type
...@@ -30,8 +30,7 @@ ...@@ -30,8 +30,7 @@
"http://localhost:10823/*", "http://localhost:10823/*",
"*://*.rtxmdz.com/*", "*://*.rtxmdz.com/*",
"https://item.upload.taobao.com/*", "https://item.upload.taobao.com/*",
"http://*/*", "https://sell.publish.tmall.com/*"
"https://*/*"
], ],
"js": ["content.js"], "js": ["content.js"],
"run_at": "document_idle" "run_at": "document_idle"
......
...@@ -13,6 +13,7 @@ let monitoringRemoveTabId = new Map(); ...@@ -13,6 +13,7 @@ let monitoringRemoveTabId = new Map();
let result_sendResponse:boolean = false let result_sendResponse:boolean = false
let tb_user:any = {} let tb_user:any = {}
let taIssueId:any = null let taIssueId:any = null
let userId:any = null
chrome.runtime.onMessage.addListener(function (message, sender, sendResponse) { chrome.runtime.onMessage.addListener(function (message, sender, sendResponse) {
// console.log('message1',message,sender); // console.log('message1',message,sender);
if (message.action === ACTION.task) { if (message.action === ACTION.task) {
...@@ -25,7 +26,6 @@ chrome.runtime.onMessage.addListener(function (message, sender, sendResponse) { ...@@ -25,7 +26,6 @@ chrome.runtime.onMessage.addListener(function (message, sender, sendResponse) {
chrome.storage.sync.remove("info") chrome.storage.sync.remove("info")
if(message.value.seller.seller_name!==tb_user.userNick){ if(message.value.seller.seller_name!==tb_user.userNick){
chrome.storage.sync.set({"info":'当前登录的千牛账号与图动力授权的账号信息不一致,请统一登录后重试!'}) chrome.storage.sync.set({"info":'当前登录的千牛账号与图动力授权的账号信息不一致,请统一登录后重试!'})
console.log(222);
sendResponse({status:-200,task_id:message.value.task_id,msg:"当前登录的千牛账号与图动力授权的账号信息不一致,请统一登录后重试!"}); sendResponse({status:-200,task_id:message.value.task_id,msg:"当前登录的千牛账号与图动力授权的账号信息不一致,请统一登录后重试!"});
return true return true
} }
...@@ -89,6 +89,10 @@ chrome.tabs.onUpdated.addListener(async (tabId, changeInfo, tab) => { ...@@ -89,6 +89,10 @@ chrome.tabs.onUpdated.addListener(async (tabId, changeInfo, tab) => {
result_sendResponse=true; result_sendResponse=true;
return return
}; };
let cnaui:any = await getCookies('https://*.mmstat.com','cnaui');
// let aui:any = await getCookies(tab.url, "cnaui");
console.log('cookie','https://.mmstat.com',cnaui.value);
userId = cnaui.value
// taIssueId&&chrome.tabs.remove(taIssueId) // taIssueId&&chrome.tabs.remove(taIssueId)
chrome.tabs.query({ chrome.tabs.query({
url:[tbIssueUrl] url:[tbIssueUrl]
...@@ -103,6 +107,7 @@ chrome.tabs.onUpdated.addListener(async (tabId, changeInfo, tab) => { ...@@ -103,6 +107,7 @@ chrome.tabs.onUpdated.addListener(async (tabId, changeInfo, tab) => {
taIssueId = await createTab(tbIssueUrl); taIssueId = await createTab(tbIssueUrl);
} }
}) })
let tuDe1 = decodeURI(userNickCookie.value); let tuDe1 = decodeURI(userNickCookie.value);
let tuDe2 = unescape(tuDe1.replace(/\\(u[0-9a-fA-F]{4})/gm, '%$1')); let tuDe2 = unescape(tuDe1.replace(/\\(u[0-9a-fA-F]{4})/gm, '%$1'));
if (tuDe2.indexOf(":") != -1) tuDe2 = tuDe2.split(":")[0]; if (tuDe2.indexOf(":") != -1) tuDe2 = tuDe2.split(":")[0];
...@@ -117,10 +122,12 @@ chrome.tabs.onUpdated.addListener(async (tabId, changeInfo, tab) => { ...@@ -117,10 +122,12 @@ chrome.tabs.onUpdated.addListener(async (tabId, changeInfo, tab) => {
let userNick:string = monitoringRemoveTabId.get(tab.id); let userNick:string = monitoringRemoveTabId.get(tab.id);
console.log('monitoringRemoveTabId',monitoringRemoveTabId); console.log('monitoringRemoveTabId',monitoringRemoveTabId);
let cookie = await getCookieAll(tab.url); let cookie = await getCookieAll(tab.url);
// console.log('cookie22',tab.url,cookie);
let token:any = await getCookies(tab.url, "XSRF-TOKEN"); let token:any = await getCookies(tab.url, "XSRF-TOKEN");
let userData:object = { let userData:object = {
cookie:cookie, cookie:cookie,
token: token.value, token: token.value,
userId:userId,
userNick: userNick, userNick: userNick,
} }
tb_user = userData tb_user = userData
......
...@@ -19,8 +19,9 @@ async function booking(info: any) { ...@@ -19,8 +19,9 @@ async function booking(info: any) {
} }
let goodsId,result; let goodsId,result;
let userDataJson:any = JSON.parse(userData) let userDataJson:any = JSON.parse(userData)
goodsId = await tbGetIssueGoodsIdV2(userDataJson, goodsData,info.goods); goodsId = await tbGetIssueGoodsIdV2(userDataJson, goodsData);
let goods = info.goods.replaceAll('775011740120',goodsId) let goods = info.goods.replaceAll('775011740120',goodsId)
goods = goods.replaceAll('88897371',userDataJson.userId)
let default_info = JSON.parse(goods) let default_info = JSON.parse(goods)
tbIssueJsonDataV2 = default_info tbIssueJsonDataV2 = default_info
result = await tbDataJoinAndIssueV2(userDataJson, goodsData, goodsId); result = await tbDataJoinAndIssueV2(userDataJson, goodsData, goodsId);
...@@ -359,12 +360,11 @@ async function tbDataJoinAndIssueV2(userData:any, goodsData:any, goodsId:number) ...@@ -359,12 +360,11 @@ async function tbDataJoinAndIssueV2(userData:any, goodsData:any, goodsId:number)
* @param {发布的商品信息} goodsData * @param {发布的商品信息} goodsData
* @returns * @returns
*/ */
async function tbGetIssueGoodsIdV2(userData:any, goodsData:any,data:any) { async function tbGetIssueGoodsIdV2(userData:any, goodsData:any) {
// let goodsModel = goodsData.data.goodsModel; // let goodsModel = goodsData.data.goodsModel;
// let picPath = goodsModel.masterPics[0]; // let picPath = goodsModel.masterPics[0];
// let userId = goodsData.data.userId; // let userId = goodsData.data.userId;
let default_info = JSON.parse(data) tbEnsureIssueJsonV2.userId = userData.userId;
tbEnsureIssueJsonV2.userId = default_info.userId;
tbEnsureIssueJsonV2.catImages = [{ tbEnsureIssueJsonV2.catImages = [{
"url": 'https://img.alicdn.com/imgextra/i3/88897371/O1CN01wCaCGh24JyKxMRdkR_!!88897371.jpg_100x100' "url": 'https://img.alicdn.com/imgextra/i3/88897371/O1CN01wCaCGh24JyKxMRdkR_!!88897371.jpg_100x100'
}]; }];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment