From 09bba83054574ab93582d5a3e646bb4db9d18cfa Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Thu, 28 Jul 2022 12:33:22 +0800 Subject: [PATCH] 增加会员帮忙测试的传参功能 --- packageD/pages/AI-test-skin/analyse/analyse.js | 24 ++++++++++++++++++++++-- packageD/pages/AI-test-skin/fail_result/fail_result.js | 5 +++++ packageD/pages/AI-test-skin/index/aiskin.js | 39 +++++++++++++++++++++++++++------------ packageD/pages/AI-test-skin/select_photo/select_photo.js | 21 ++++++++++++++++++++- packageD/pages/AI-test-skin/shoot_notice/shoot_notice.js | 12 +++++++++++- packageD/pages/AI-test-skin/success_result/success_result.wxml | 2 +- 6 files changed, 86 insertions(+), 17 deletions(-) diff --git a/packageD/pages/AI-test-skin/analyse/analyse.js b/packageD/pages/AI-test-skin/analyse/analyse.js index 7c3dba8..56a2c87 100644 --- a/packageD/pages/AI-test-skin/analyse/analyse.js +++ b/packageD/pages/AI-test-skin/analyse/analyse.js @@ -25,6 +25,7 @@ Page({ sourceimg: null, err_map: null, skin_type: 0, + ce_user_id:0, }, /** @@ -35,6 +36,10 @@ Page({ var plugin = requirePlugin('mtSkinSdk') plugin.setConfig(pluginGD) } + + if(options.ce_user_id) + this.data.ce_user_id=options.ce_user_id; + var th = this; //设置错误码分析 this.set_err_map(); @@ -212,13 +217,14 @@ Page({ //检查图片有没有OK 百度 img_check_bd: function (func) { var th = this; + var user_id=this.data.ce_user_id || getApp().globalData.user_id; var data = { "appid": "25521854", "image": getApp().globalData.face_SourceImg, "face_field": "age,expression,face_shape,gender,glasses,landmark,landmark150,quality,eye_status,emotion,face_type,mask,spoofing", "image_type": "URL", "store_id":setting.stoid, - "user_id":getApp().globalData.user_id + "user_id":user_id } //开始调用百度接口，进行对图片进行判断是否符合标准 this.json_post("/api/weshop/baidubce/face/skindetect", data, function (res) { @@ -536,13 +542,14 @@ Page({ //百度测肤接口 analyse_by_bd: function (data) { var th = this; + var user_id=this.data.ce_user_id || getApp().globalData.user_id; //开始调用接口，进行分析 this.json_post("/api/weshop/baidubce/face/skinAnalyze", data, function (res) { if (res.data.code == 0) { getApp().globalData.face_result = res.data.data; var req_data = { store_id: setting.stoid, - user_id: getApp().globalData.user_id, + user_id: user_id, img: getApp().globalData.face_img, sourceimg: getApp().globalData.face_SourceImg, addtime: ut.gettimestamp(), @@ -553,7 +560,12 @@ Page({ //要保存一下分析的结果 th.json_post("/api/weshop/face/storeSkinface/save", req_data, function (res) { if (res.data.code == 0) { + console.log('---ce_id----'); + console.log(res.data.data.id); let url = "/packageD/pages/AI-test-skin/success_result/success_result?id=" + res.data.data.id; //跳到分析页 + if(th.data.ce_user_id) + url+="&ce_user_id="+th.data.ce_user_id; + wx.redirectTo({ url: url }) @@ -564,6 +576,9 @@ Page({ } else { var msg = th.data.err_map[res.data.code + ""]; let url = "/packageD/pages/AI-test-skin/fail_result/fail_result?msg=" + msg; //跳到分析页 + if(this.data.ce_user_id) + url+="&ce_user_id="+this.data.ce_user_id; + wx.redirectTo({ url: url }) @@ -573,6 +588,9 @@ Page({ //跳转到错误页面 美图 go_error: function (fail_result) { let url = `/packageD/pages/AI-test-skin/fail_result/fail_result?fail_result=${fail_result}`; //跳到分析页 + if(this.data.ce_user_id) + url+="&ce_user_id="+this.data.ce_user_id; + wx.redirectTo({ url: url }); @@ -580,6 +598,8 @@ Page({ //跳转到错误页面 go_error1: function (msg) { let url = "/packageD/pages/AI-test-skin/fail_result/fail_result?msg=" + msg; //跳到分析页 + if(this.data.ce_user_id) + url+="&ce_user_id="+this.data.ce_user_id; wx.redirectTo({ url: url }); diff --git a/packageD/pages/AI-test-skin/fail_result/fail_result.js b/packageD/pages/AI-test-skin/fail_result/fail_result.js index dad8387..ac0dd43 100644 --- a/packageD/pages/AI-test-skin/fail_result/fail_result.js +++ b/packageD/pages/AI-test-skin/fail_result/fail_result.js @@ -21,6 +21,7 @@ Page({ iurl: setting.imghost, msg:null, fail_result:new Array(), //失败原因 + ce_user_id:0 }, /** @@ -38,6 +39,9 @@ Page({ msg:options.msg }) } + + if(options.ce_user_id) this.data.ce_user_id=options.ce_user_id; + // msg=decodeURIComponent(msg); // this.setData({msg:msg}); }, @@ -65,6 +69,7 @@ Page({ //从相册中选择图片 back_to:function () { let url = "/packageD/pages/AI-test-skin/shoot_notice/shoot_notice"; + if(this.data.ce_user_id) url+="?ce_user_id="+this.data.ce_user_id; app.goto(url); }, diff --git a/packageD/pages/AI-test-skin/index/aiskin.js b/packageD/pages/AI-test-skin/index/aiskin.js index 70304b7..29d3bb3 100644 --- a/packageD/pages/AI-test-skin/index/aiskin.js +++ b/packageD/pages/AI-test-skin/index/aiskin.js @@ -19,20 +19,24 @@ Page({ */ data: { iurl: setting.imghost, + ce_user_id:0, }, /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { - let user_id = options.user_id || getApp().globalData.user_id; + let user_id = options.user_id; if (user_id) { - getApp().getUserFir(); + this.data.ce_user_id=user_id; } else { - setTimeout(function () { - let url = "/pages/togoin/togoin"; - app.goto(url); - }, 1000) + let user_id=getApp().globalData.user_id; + if(!user_id) { + setTimeout(function () { + let url = "/pages/togoin/togoin"; + app.goto(url); + }, 1000) + } } }, @@ -61,14 +65,20 @@ Page({ goto(e) { var need=e.currentTarget.dataset.need; + + let url = e.currentTarget.dataset.url; + if(this.data.ce_user_id){ + url+="?ce_user_id="+this.data.ce_user_id; + } + if(!need){ - let url = e.currentTarget.dataset.url; + app.goto(url); return false; } this.check_num(function () { - var user = getApp().globalData.userInfo; + var user = getApp().globalData.userInfo || this.ce_user_id if (!user) { wx.showToast({ title: "请先授权登陆", @@ -83,7 +93,6 @@ Page({ return false; } - let url = e.currentTarget.dataset.url; app.goto(url); }) @@ -120,7 +129,9 @@ Page({ async getHistoryData() { - if (!getApp().globalData.user_id) return false; + + var user_id=getApp().globalData.user_id || getApp().globalData.ce_user_id; + if (!user_id) return false; if (this.data.show_his) return false; let history = this.data.history; @@ -129,7 +140,7 @@ Page({ isShowLoading: true, data: { store_id: setting.stoid, - user_id: os.user_id, + user_id: user_id, page: 1, pageSize: 1, } @@ -141,6 +152,10 @@ Page({ }, check_num:function (func) { + + var user_id=this.ce_user_id || getApp().globalData.user_id; + if (!user_id) return false; + //判断右没有开AI测肤 getApp().promiseGet("/api/weshop/wx/weappSkin/get/"+setting.stoid,{}).then(rs=>{ if(rs.data.code!=0 || !rs.data.data){ @@ -158,7 +173,7 @@ Page({ }else{ var rdata={ store_id:setting.stoid, - user_id:getApp().globalData.user_id + user_id:user_id } this.json_post("/api/weshop/baidubce/face/skinvip",rdata,res=>{ if(res.data.code==0){ diff --git a/packageD/pages/AI-test-skin/select_photo/select_photo.js b/packageD/pages/AI-test-skin/select_photo/select_photo.js index 28fb089..f727d19 100644 --- a/packageD/pages/AI-test-skin/select_photo/select_photo.js +++ b/packageD/pages/AI-test-skin/select_photo/select_photo.js @@ -13,6 +13,7 @@ Page({ iurl: setting.imghost, gl_skin_img: null, skin_type: 0, + ce_user_id:0 }, /** @@ -21,10 +22,14 @@ Page({ onLoad: function (options) { var img = getApp().globalData.skin_img_info; this.setData({ gl_skin_img: img }) + + var ce_user_id=options.ce_user_id; + if(ce_user_id) this.data.ce_user_id=ce_user_id; }, //-- 完成选择 -- ok_select: function () { + const th = this; this.check_num(function () { let filePath = th.data.gl_skin_img['path']; @@ -36,6 +41,12 @@ Page({ getApp().globalData.face_img = e.data.data.img; getApp().globalData.face_SourceImg = e.data.data.SourceImg; let url = "/packageD/pages/AI-test-skin/analyse/analyse"; //跳到分析页 + if(th.data.ce_user_id) + url+="?ce_user_id="+th.data.ce_user_id; + + console.log("select_ph"); + console.log(url); + app.goto(url); } else { wx.showToast({ @@ -105,6 +116,9 @@ Page({ size, } let url = "/packageD/pages/AI-test-skin/select_photo/select_photo"; + if(th.data.ce_user_id) + url+="?ce_user_id="+th.data.ce_user_id; + app.goto(url); // that.base64(img,"jpg"); return; @@ -147,6 +161,8 @@ Page({ size: size1 }; let url = "/packageD/pages/AI-test-skin/select_photo/select_photo"; + if(th.data.ce_user_id) + url+="?ce_user_id="+th.data.ce_user_id; app.goto(url); }, fail: function (res) { @@ -182,6 +198,7 @@ Page({ }, check_num:function (func) { + var th=this; //判断右没有开AI测肤 getApp().promiseGet("/api/weshop/wx/weappSkin/get/"+setting.stoid,{}).then(rs=>{ if(rs.data.code!=0 || !rs.data.data){ @@ -197,9 +214,11 @@ Page({ duration: 3000 }) }else{ + + var user_id= th.data.ce_user_id || getApp().globalData.user_id; var rdata={ store_id:setting.stoid, - user_id:getApp().globalData.user_id + user_id:user_id } this.json_post("/api/weshop/baidubce/face/skinvip",rdata,res=>{ if(res.data.code==0){ diff --git a/packageD/pages/AI-test-skin/shoot_notice/shoot_notice.js b/packageD/pages/AI-test-skin/shoot_notice/shoot_notice.js index 498e18f..a42b0b6 100644 --- a/packageD/pages/AI-test-skin/shoot_notice/shoot_notice.js +++ b/packageD/pages/AI-test-skin/shoot_notice/shoot_notice.js @@ -23,13 +23,15 @@ Page({ skin_type: 0, cWidth: 0, cHeight: 0, + ce_user_id: 0 }, /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { - + var ce_user_id=options.ce_user_id; + if(ce_user_id) this.data.ce_user_id=ce_user_id; }, /** @@ -91,6 +93,8 @@ Page({ console.log(imgArr); getApp().globalData.skin_img_info = imgArr[0]; let url = "/packageD/pages/AI-test-skin/select_photo/select_photo"; + if(th.data.ce_user_id) + url+="?ce_user_id="+th.data.ce_user_id; app.goto(url); } }) @@ -158,6 +162,9 @@ Page({ size, } let url = "/packageD/pages/AI-test-skin/select_photo/select_photo"; + if(this.data.ce_user_id){ + url+="?ce_user_id="+this.data.ce_user_id; + } app.goto(url); // that.base64(img,"jpg"); return; @@ -205,6 +212,9 @@ Page({ size:size1 }; let url = "/packageD/pages/AI-test-skin/select_photo/select_photo"; + if(that.data.ce_user_id) + url+="?ce_user_id="+that.data.ce_user_id; + app.goto(url); }, fail: function (res) { diff --git a/packageD/pages/AI-test-skin/success_result/success_result.wxml b/packageD/pages/AI-test-skin/success_result/success_result.wxml index 370048e..c0373a7 100644 --- a/packageD/pages/AI-test-skin/success_result/success_result.wxml +++ b/packageD/pages/AI-test-skin/success_result/success_result.wxml @@ -8,7 +8,7 @@ --> - + {{item.name}} -- libgit2 0.21.4