diff --git a/pages/index/index.js b/pages/index/index.js index a6b7280..5a400c9 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -151,7 +151,7 @@ Page({ epd_model_select: { // array: ['1.54', '4.2c', '5.83c', '7.5c', '1.54c'], - array: ['1.54', '2.66c', '2.66hc', '2.9c', '4.2c', '5.83c', '7.5c'], + array: ['1.54', '2.66c', '2.66hc', '2.9c', '4.2c', '5.83c', '7.5c', '2.7'], objectArray: [{ id: 0, name: '1.54', @@ -236,6 +236,18 @@ Page({ rotationSet: 0, //旋转 }, }, + { + id: 7, + name: '2.7c', + epd: { + model: "epd_EPD270T91", + width: 176, + height: 264, + color: 2, + rotation: 0, //初始 + rotationSet: 0, //旋转 + }, + }, ], }, rotate_select: { @@ -790,8 +802,8 @@ Page({ // let dithering_select = this.data.dithering_select.objectArray[this.data.config.page_image.dithering_index].value let dithering_select = this.data.config.epd.color == 2 ? this.data.dithering_select.objectArray[this.data.config.page_image.dithering_index].value2 : this.data.dithering_select.objectArray[this.data.config.page_image.dithering_index].value3 - if ((this.data.config.epd.model == 'epd_EPD154C1' & (!dithering_select.startsWith('bwr')) || this.data.config.epd.model == 'epd_EPD154Z90' || this.data.config.epd.model == 'epd_EPD290Z94' || this.data.config.epd.model == 'epd_EPD266Z90' || this.data.config.epd.model == 'epd_EPD420Z96' || this.data.config.epd.model == 'epd_EPD266H850')) { - // if (1) { + // if ((this.data.config.epd.model == 'epd_EPD154C1' & (!dithering_select.startsWith('bwr')) || this.data.config.epd.model == 'epd_EPD154Z90' || this.data.config.epd.model == 'epd_EPD290Z94' || this.data.config.epd.model == 'epd_EPD266Z90' || this.data.config.epd.model == 'epd_EPD420Z96' || this.data.config.epd.model == 'epd_EPD266H850')) { + if (1) { wx.navigateTo({ url: '../nfc/nfc' })