Commit e9be6be4 authored by jiangjiantao's avatar jiangjiantao

Merge branch 'dev-1.0' of…

Merge branch 'dev-1.0' of https://gitlab.infra.miyatech.com/pengguangpu/doublescreen-back into dev-1.0
parents 4dfb6e9c 6df1cdda
...@@ -16,18 +16,18 @@ Page({ ...@@ -16,18 +16,18 @@ Page({
data: { data: {
//页面控制相关参数 //页面控制相关参数
pageShow: { pageShow: {
"home": true, "home": false,
"landscan": false, "landscan": false,
"waitoperate": false, "waitoperate": false,
"payresult": false, "payresult": false,
"operateresult": false, "operateresult": false,
"printlastorder": false, "printlastorder": false,
"poster": false, "poster": true,
"aboutsystem": false, "aboutsystem": false,
"appsetting": false, "appsetting": false,
}, },
// 前屏是否完成登录 // 前屏是否完成登录
isFrontScreenLoginOK: false, isFrontScreenLoginOK: true,
flowType: "", //流程类型:用于区分易混淆的流程,以及共同界面使用时用该标识位作为区分 flowType: "", //流程类型:用于区分易混淆的流程,以及共同界面使用时用该标识位作为区分
/**账号信息 */ /**账号信息 */
...@@ -105,8 +105,6 @@ Page({ ...@@ -105,8 +105,6 @@ Page({
posterList: [ posterList: [
{ url: "/images/img_ad1.png", selected: true }, { url: "/images/img_ad1.png", selected: true },
{ url: "/images/img_ad2.png", selected: false }, { url: "/images/img_ad2.png", selected: false },
{ url: "/images/img_ad1.png", selected: false },
{ url: "/images/img_ad2.png", selected: false }
], ],
}, },
...@@ -1111,8 +1109,7 @@ Page({ ...@@ -1111,8 +1109,7 @@ Page({
console.log("event==>" + JSON.stringify(event)); console.log("event==>" + JSON.stringify(event));
//获取点击的index //获取点击的index
var index = event.target.dataset.index; var index = event.target.dataset.index;
var tempList = []; var tempList = { ...this.data.posterList };
tempList = tempList.concat(this.data.posterList);
//遍历改变posterList状态 //遍历改变posterList状态
for (var i = 0; i < tempList.length; i++) { for (var i = 0; i < tempList.length; i++) {
if (i == index) { if (i == index) {
...@@ -1121,13 +1118,15 @@ Page({ ...@@ -1121,13 +1118,15 @@ Page({
tempList[i].selected = false; tempList[i].selected = false;
} }
} }
var selAdUrl = tempList[index].url;
console.log(selAdUrl);
let context = this; let context = this;
//发送指令至前屏 //发送指令至前屏
my.ix.sendBuddyMessage({ my.ix.sendBuddyMessage({
target: getApp().globalData.frontScreenAppId, target: getApp().globalData.frontScreenAppId,
data: { data: {
action: ACTION_SEND_SEL_AD, action: ACTION_SEND_SEL_AD,
data: tempList[index].url data: selAdUrl
}, },
success: (res) => { success: (res) => {
my.showToast({ my.showToast({
......
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