diff --git a/common/uqrcode.js b/common/uqrcode.js
new file mode 100644
index 0000000..6b15f35
--- /dev/null
+++ b/common/uqrcode.js
@@ -0,0 +1,1439 @@
+// uqrcode.js
+//---------------------------------------------------------------------
+// github https://github.com/Sansnn/uQRCode
+//---------------------------------------------------------------------
+
+let uQRCode = {};
+
+(function() {
+    //---------------------------------------------------------------------
+    // QRCode for JavaScript
+    //
+    // Copyright (c) 2009 Kazuhiko Arase
+    //
+    // URL: http://www.d-project.com/
+    //
+    // Licensed under the MIT license:
+    //   http://www.opensource.org/licenses/mit-license.php
+    //
+    // The word "QR Code" is registered trademark of 
+    // DENSO WAVE INCORPORATED
+    //   http://www.denso-wave.com/qrcode/faqpatent-e.html
+    //
+    //---------------------------------------------------------------------
+
+    //---------------------------------------------------------------------
+    // QR8bitByte
+    //---------------------------------------------------------------------
+
+    function QR8bitByte(data) {
+        this.mode = QRMode.MODE_8BIT_BYTE;
+        this.data = data;
+    }
+
+    QR8bitByte.prototype = {
+
+        getLength: function(buffer) {
+            return this.data.length;
+        },
+
+        write: function(buffer) {
+            for (var i = 0; i < this.data.length; i++) {
+                // not JIS ...
+                buffer.put(this.data.charCodeAt(i), 8);
+            }
+        }
+    };
+
+    //---------------------------------------------------------------------
+    // QRCode
+    //---------------------------------------------------------------------
+
+    function QRCode(typeNumber, errorCorrectLevel) {
+        this.typeNumber = typeNumber;
+        this.errorCorrectLevel = errorCorrectLevel;
+        this.modules = null;
+        this.moduleCount = 0;
+        this.dataCache = null;
+        this.dataList = new Array();
+    }
+
+    QRCode.prototype = {
+
+        addData: function(data) {
+            var newData = new QR8bitByte(data);
+            this.dataList.push(newData);
+            this.dataCache = null;
+        },
+
+        isDark: function(row, col) {
+            if (row < 0 || this.moduleCount <= row || col < 0 || this.moduleCount <= col) {
+                throw new Error(row + "," + col);
+            }
+            return this.modules[row][col];
+        },
+
+        getModuleCount: function() {
+            return this.moduleCount;
+        },
+
+        make: function() {
+            // Calculate automatically typeNumber if provided is < 1
+            if (this.typeNumber < 1) {
+                var typeNumber = 1;
+                for (typeNumber = 1; typeNumber < 40; typeNumber++) {
+                    var rsBlocks = QRRSBlock.getRSBlocks(typeNumber, this.errorCorrectLevel);
+
+                    var buffer = new QRBitBuffer();
+                    var totalDataCount = 0;
+                    for (var i = 0; i < rsBlocks.length; i++) {
+                        totalDataCount += rsBlocks[i].dataCount;
+                    }
+
+                    for (var i = 0; i < this.dataList.length; i++) {
+                        var data = this.dataList[i];
+                        buffer.put(data.mode, 4);
+                        buffer.put(data.getLength(), QRUtil.getLengthInBits(data.mode, typeNumber));
+                        data.write(buffer);
+                    }
+                    if (buffer.getLengthInBits() <= totalDataCount * 8)
+                        break;
+                }
+                this.typeNumber = typeNumber;
+            }
+            this.makeImpl(false, this.getBestMaskPattern());
+        },
+
+        makeImpl: function(test, maskPattern) {
+
+            this.moduleCount = this.typeNumber * 4 + 17;
+            this.modules = new Array(this.moduleCount);
+
+            for (var row = 0; row < this.moduleCount; row++) {
+
+                this.modules[row] = new Array(this.moduleCount);
+
+                for (var col = 0; col < this.moduleCount; col++) {
+                    this.modules[row][col] = null; //(col + row) % 3;
+                }
+            }
+
+            this.setupPositionProbePattern(0, 0);
+            this.setupPositionProbePattern(this.moduleCount - 7, 0);
+            this.setupPositionProbePattern(0, this.moduleCount - 7);
+            this.setupPositionAdjustPattern();
+            this.setupTimingPattern();
+            this.setupTypeInfo(test, maskPattern);
+
+            if (this.typeNumber >= 7) {
+                this.setupTypeNumber(test);
+            }
+
+            if (this.dataCache == null) {
+                this.dataCache = QRCode.createData(this.typeNumber, this.errorCorrectLevel, this.dataList);
+            }
+
+            this.mapData(this.dataCache, maskPattern);
+        },
+
+        setupPositionProbePattern: function(row, col) {
+
+            for (var r = -1; r <= 7; r++) {
+
+                if (row + r <= -1 || this.moduleCount <= row + r) continue;
+
+                for (var c = -1; c <= 7; c++) {
+
+                    if (col + c <= -1 || this.moduleCount <= col + c) continue;
+
+                    if ((0 <= r && r <= 6 && (c == 0 || c == 6)) ||
+                        (0 <= c && c <= 6 && (r == 0 || r == 6)) ||
+                        (2 <= r && r <= 4 && 2 <= c && c <= 4)) {
+                        this.modules[row + r][col + c] = true;
+                    } else {
+                        this.modules[row + r][col + c] = false;
+                    }
+                }
+            }
+        },
+
+        getBestMaskPattern: function() {
+
+            var minLostPoint = 0;
+            var pattern = 0;
+
+            for (var i = 0; i < 8; i++) {
+
+                this.makeImpl(true, i);
+
+                var lostPoint = QRUtil.getLostPoint(this);
+
+                if (i == 0 || minLostPoint > lostPoint) {
+                    minLostPoint = lostPoint;
+                    pattern = i;
+                }
+            }
+
+            return pattern;
+        },
+
+        createMovieClip: function(target_mc, instance_name, depth) {
+
+            var qr_mc = target_mc.createEmptyMovieClip(instance_name, depth);
+            var cs = 1;
+
+            this.make();
+
+            for (var row = 0; row < this.modules.length; row++) {
+
+                var y = row * cs;
+
+                for (var col = 0; col < this.modules[row].length; col++) {
+
+                    var x = col * cs;
+                    var dark = this.modules[row][col];
+
+                    if (dark) {
+                        qr_mc.beginFill(0, 100);
+                        qr_mc.moveTo(x, y);
+                        qr_mc.lineTo(x + cs, y);
+                        qr_mc.lineTo(x + cs, y + cs);
+                        qr_mc.lineTo(x, y + cs);
+                        qr_mc.endFill();
+                    }
+                }
+            }
+
+            return qr_mc;
+        },
+
+        setupTimingPattern: function() {
+
+            for (var r = 8; r < this.moduleCount - 8; r++) {
+                if (this.modules[r][6] != null) {
+                    continue;
+                }
+                this.modules[r][6] = (r % 2 == 0);
+            }
+
+            for (var c = 8; c < this.moduleCount - 8; c++) {
+                if (this.modules[6][c] != null) {
+                    continue;
+                }
+                this.modules[6][c] = (c % 2 == 0);
+            }
+        },
+
+        setupPositionAdjustPattern: function() {
+
+            var pos = QRUtil.getPatternPosition(this.typeNumber);
+
+            for (var i = 0; i < pos.length; i++) {
+
+                for (var j = 0; j < pos.length; j++) {
+
+                    var row = pos[i];
+                    var col = pos[j];
+
+                    if (this.modules[row][col] != null) {
+                        continue;
+                    }
+
+                    for (var r = -2; r <= 2; r++) {
+
+                        for (var c = -2; c <= 2; c++) {
+
+                            if (r == -2 || r == 2 || c == -2 || c == 2 ||
+                                (r == 0 && c == 0)) {
+                                this.modules[row + r][col + c] = true;
+                            } else {
+                                this.modules[row + r][col + c] = false;
+                            }
+                        }
+                    }
+                }
+            }
+        },
+
+        setupTypeNumber: function(test) {
+
+            var bits = QRUtil.getBCHTypeNumber(this.typeNumber);
+
+            for (var i = 0; i < 18; i++) {
+                var mod = (!test && ((bits >> i) & 1) == 1);
+                this.modules[Math.floor(i / 3)][i % 3 + this.moduleCount - 8 - 3] = mod;
+            }
+
+            for (var i = 0; i < 18; i++) {
+                var mod = (!test && ((bits >> i) & 1) == 1);
+                this.modules[i % 3 + this.moduleCount - 8 - 3][Math.floor(i / 3)] = mod;
+            }
+        },
+
+        setupTypeInfo: function(test, maskPattern) {
+
+            var data = (this.errorCorrectLevel << 3) | maskPattern;
+            var bits = QRUtil.getBCHTypeInfo(data);
+
+            // vertical        
+            for (var i = 0; i < 15; i++) {
+
+                var mod = (!test && ((bits >> i) & 1) == 1);
+
+                if (i < 6) {
+                    this.modules[i][8] = mod;
+                } else if (i < 8) {
+                    this.modules[i + 1][8] = mod;
+                } else {
+                    this.modules[this.moduleCount - 15 + i][8] = mod;
+                }
+            }
+
+            // horizontal
+            for (var i = 0; i < 15; i++) {
+
+                var mod = (!test && ((bits >> i) & 1) == 1);
+
+                if (i < 8) {
+                    this.modules[8][this.moduleCount - i - 1] = mod;
+                } else if (i < 9) {
+                    this.modules[8][15 - i - 1 + 1] = mod;
+                } else {
+                    this.modules[8][15 - i - 1] = mod;
+                }
+            }
+
+            // fixed module
+            this.modules[this.moduleCount - 8][8] = (!test);
+
+        },
+
+        mapData: function(data, maskPattern) {
+
+            var inc = -1;
+            var row = this.moduleCount - 1;
+            var bitIndex = 7;
+            var byteIndex = 0;
+
+            for (var col = this.moduleCount - 1; col > 0; col -= 2) {
+
+                if (col == 6) col--;
+
+                while (true) {
+
+                    for (var c = 0; c < 2; c++) {
+
+                        if (this.modules[row][col - c] == null) {
+
+                            var dark = false;
+
+                            if (byteIndex < data.length) {
+                                dark = (((data[byteIndex] >>> bitIndex) & 1) == 1);
+                            }
+
+                            var mask = QRUtil.getMask(maskPattern, row, col - c);
+
+                            if (mask) {
+                                dark = !dark;
+                            }
+
+                            this.modules[row][col - c] = dark;
+                            bitIndex--;
+
+                            if (bitIndex == -1) {
+                                byteIndex++;
+                                bitIndex = 7;
+                            }
+                        }
+                    }
+
+                    row += inc;
+
+                    if (row < 0 || this.moduleCount <= row) {
+                        row -= inc;
+                        inc = -inc;
+                        break;
+                    }
+                }
+            }
+
+        }
+
+    };
+
+    QRCode.PAD0 = 0xEC;
+    QRCode.PAD1 = 0x11;
+
+    QRCode.createData = function(typeNumber, errorCorrectLevel, dataList) {
+
+        var rsBlocks = QRRSBlock.getRSBlocks(typeNumber, errorCorrectLevel);
+
+        var buffer = new QRBitBuffer();
+
+        for (var i = 0; i < dataList.length; i++) {
+            var data = dataList[i];
+            buffer.put(data.mode, 4);
+            buffer.put(data.getLength(), QRUtil.getLengthInBits(data.mode, typeNumber));
+            data.write(buffer);
+        }
+
+        // calc num max data.
+        var totalDataCount = 0;
+        for (var i = 0; i < rsBlocks.length; i++) {
+            totalDataCount += rsBlocks[i].dataCount;
+        }
+
+        if (buffer.getLengthInBits() > totalDataCount * 8) {
+            throw new Error("code length overflow. (" +
+                buffer.getLengthInBits() +
+                ">" +
+                totalDataCount * 8 +
+                ")");
+        }
+
+        // end code
+        if (buffer.getLengthInBits() + 4 <= totalDataCount * 8) {
+            buffer.put(0, 4);
+        }
+
+        // padding
+        while (buffer.getLengthInBits() % 8 != 0) {
+            buffer.putBit(false);
+        }
+
+        // padding
+        while (true) {
+
+            if (buffer.getLengthInBits() >= totalDataCount * 8) {
+                break;
+            }
+            buffer.put(QRCode.PAD0, 8);
+
+            if (buffer.getLengthInBits() >= totalDataCount * 8) {
+                break;
+            }
+            buffer.put(QRCode.PAD1, 8);
+        }
+
+        return QRCode.createBytes(buffer, rsBlocks);
+    }
+
+    QRCode.createBytes = function(buffer, rsBlocks) {
+
+        var offset = 0;
+
+        var maxDcCount = 0;
+        var maxEcCount = 0;
+
+        var dcdata = new Array(rsBlocks.length);
+        var ecdata = new Array(rsBlocks.length);
+
+        for (var r = 0; r < rsBlocks.length; r++) {
+
+            var dcCount = rsBlocks[r].dataCount;
+            var ecCount = rsBlocks[r].totalCount - dcCount;
+
+            maxDcCount = Math.max(maxDcCount, dcCount);
+            maxEcCount = Math.max(maxEcCount, ecCount);
+
+            dcdata[r] = new Array(dcCount);
+
+            for (var i = 0; i < dcdata[r].length; i++) {
+                dcdata[r][i] = 0xff & buffer.buffer[i + offset];
+            }
+            offset += dcCount;
+
+            var rsPoly = QRUtil.getErrorCorrectPolynomial(ecCount);
+            var rawPoly = new QRPolynomial(dcdata[r], rsPoly.getLength() - 1);
+
+            var modPoly = rawPoly.mod(rsPoly);
+            ecdata[r] = new Array(rsPoly.getLength() - 1);
+            for (var i = 0; i < ecdata[r].length; i++) {
+                var modIndex = i + modPoly.getLength() - ecdata[r].length;
+                ecdata[r][i] = (modIndex >= 0) ? modPoly.get(modIndex) : 0;
+            }
+
+        }
+
+        var totalCodeCount = 0;
+        for (var i = 0; i < rsBlocks.length; i++) {
+            totalCodeCount += rsBlocks[i].totalCount;
+        }
+
+        var data = new Array(totalCodeCount);
+        var index = 0;
+
+        for (var i = 0; i < maxDcCount; i++) {
+            for (var r = 0; r < rsBlocks.length; r++) {
+                if (i < dcdata[r].length) {
+                    data[index++] = dcdata[r][i];
+                }
+            }
+        }
+
+        for (var i = 0; i < maxEcCount; i++) {
+            for (var r = 0; r < rsBlocks.length; r++) {
+                if (i < ecdata[r].length) {
+                    data[index++] = ecdata[r][i];
+                }
+            }
+        }
+
+        return data;
+
+    }
+
+    //---------------------------------------------------------------------
+    // QRMode
+    //---------------------------------------------------------------------
+
+    var QRMode = {
+        MODE_NUMBER: 1 << 0,
+        MODE_ALPHA_NUM: 1 << 1,
+        MODE_8BIT_BYTE: 1 << 2,
+        MODE_KANJI: 1 << 3
+    };
+
+    //---------------------------------------------------------------------
+    // QRErrorCorrectLevel
+    //---------------------------------------------------------------------
+
+    var QRErrorCorrectLevel = {
+        L: 1,
+        M: 0,
+        Q: 3,
+        H: 2
+    };
+
+    //---------------------------------------------------------------------
+    // QRMaskPattern
+    //---------------------------------------------------------------------
+
+    var QRMaskPattern = {
+        PATTERN000: 0,
+        PATTERN001: 1,
+        PATTERN010: 2,
+        PATTERN011: 3,
+        PATTERN100: 4,
+        PATTERN101: 5,
+        PATTERN110: 6,
+        PATTERN111: 7
+    };
+
+    //---------------------------------------------------------------------
+    // QRUtil
+    //---------------------------------------------------------------------
+
+    var QRUtil = {
+
+        PATTERN_POSITION_TABLE: [
+            [],
+            [6, 18],
+            [6, 22],
+            [6, 26],
+            [6, 30],
+            [6, 34],
+            [6, 22, 38],
+            [6, 24, 42],
+            [6, 26, 46],
+            [6, 28, 50],
+            [6, 30, 54],
+            [6, 32, 58],
+            [6, 34, 62],
+            [6, 26, 46, 66],
+            [6, 26, 48, 70],
+            [6, 26, 50, 74],
+            [6, 30, 54, 78],
+            [6, 30, 56, 82],
+            [6, 30, 58, 86],
+            [6, 34, 62, 90],
+            [6, 28, 50, 72, 94],
+            [6, 26, 50, 74, 98],
+            [6, 30, 54, 78, 102],
+            [6, 28, 54, 80, 106],
+            [6, 32, 58, 84, 110],
+            [6, 30, 58, 86, 114],
+            [6, 34, 62, 90, 118],
+            [6, 26, 50, 74, 98, 122],
+            [6, 30, 54, 78, 102, 126],
+            [6, 26, 52, 78, 104, 130],
+            [6, 30, 56, 82, 108, 134],
+            [6, 34, 60, 86, 112, 138],
+            [6, 30, 58, 86, 114, 142],
+            [6, 34, 62, 90, 118, 146],
+            [6, 30, 54, 78, 102, 126, 150],
+            [6, 24, 50, 76, 102, 128, 154],
+            [6, 28, 54, 80, 106, 132, 158],
+            [6, 32, 58, 84, 110, 136, 162],
+            [6, 26, 54, 82, 110, 138, 166],
+            [6, 30, 58, 86, 114, 142, 170]
+        ],
+
+        G15: (1 << 10) | (1 << 8) | (1 << 5) | (1 << 4) | (1 << 2) | (1 << 1) | (1 << 0),
+        G18: (1 << 12) | (1 << 11) | (1 << 10) | (1 << 9) | (1 << 8) | (1 << 5) | (1 << 2) | (1 << 0),
+        G15_MASK: (1 << 14) | (1 << 12) | (1 << 10) | (1 << 4) | (1 << 1),
+
+        getBCHTypeInfo: function(data) {
+            var d = data << 10;
+            while (QRUtil.getBCHDigit(d) - QRUtil.getBCHDigit(QRUtil.G15) >= 0) {
+                d ^= (QRUtil.G15 << (QRUtil.getBCHDigit(d) - QRUtil.getBCHDigit(QRUtil.G15)));
+            }
+            return ((data << 10) | d) ^ QRUtil.G15_MASK;
+        },
+
+        getBCHTypeNumber: function(data) {
+            var d = data << 12;
+            while (QRUtil.getBCHDigit(d) - QRUtil.getBCHDigit(QRUtil.G18) >= 0) {
+                d ^= (QRUtil.G18 << (QRUtil.getBCHDigit(d) - QRUtil.getBCHDigit(QRUtil.G18)));
+            }
+            return (data << 12) | d;
+        },
+
+        getBCHDigit: function(data) {
+
+            var digit = 0;
+
+            while (data != 0) {
+                digit++;
+                data >>>= 1;
+            }
+
+            return digit;
+        },
+
+        getPatternPosition: function(typeNumber) {
+            return QRUtil.PATTERN_POSITION_TABLE[typeNumber - 1];
+        },
+
+        getMask: function(maskPattern, i, j) {
+
+            switch (maskPattern) {
+
+                case QRMaskPattern.PATTERN000:
+                    return (i + j) % 2 == 0;
+                case QRMaskPattern.PATTERN001:
+                    return i % 2 == 0;
+                case QRMaskPattern.PATTERN010:
+                    return j % 3 == 0;
+                case QRMaskPattern.PATTERN011:
+                    return (i + j) % 3 == 0;
+                case QRMaskPattern.PATTERN100:
+                    return (Math.floor(i / 2) + Math.floor(j / 3)) % 2 == 0;
+                case QRMaskPattern.PATTERN101:
+                    return (i * j) % 2 + (i * j) % 3 == 0;
+                case QRMaskPattern.PATTERN110:
+                    return ((i * j) % 2 + (i * j) % 3) % 2 == 0;
+                case QRMaskPattern.PATTERN111:
+                    return ((i * j) % 3 + (i + j) % 2) % 2 == 0;
+
+                default:
+                    throw new Error("bad maskPattern:" + maskPattern);
+            }
+        },
+
+        getErrorCorrectPolynomial: function(errorCorrectLength) {
+
+            var a = new QRPolynomial([1], 0);
+
+            for (var i = 0; i < errorCorrectLength; i++) {
+                a = a.multiply(new QRPolynomial([1, QRMath.gexp(i)], 0));
+            }
+
+            return a;
+        },
+
+        getLengthInBits: function(mode, type) {
+
+            if (1 <= type && type < 10) {
+
+                // 1 - 9
+
+                switch (mode) {
+                    case QRMode.MODE_NUMBER:
+                        return 10;
+                    case QRMode.MODE_ALPHA_NUM:
+                        return 9;
+                    case QRMode.MODE_8BIT_BYTE:
+                        return 8;
+                    case QRMode.MODE_KANJI:
+                        return 8;
+                    default:
+                        throw new Error("mode:" + mode);
+                }
+
+            } else if (type < 27) {
+
+                // 10 - 26
+
+                switch (mode) {
+                    case QRMode.MODE_NUMBER:
+                        return 12;
+                    case QRMode.MODE_ALPHA_NUM:
+                        return 11;
+                    case QRMode.MODE_8BIT_BYTE:
+                        return 16;
+                    case QRMode.MODE_KANJI:
+                        return 10;
+                    default:
+                        throw new Error("mode:" + mode);
+                }
+
+            } else if (type < 41) {
+
+                // 27 - 40
+
+                switch (mode) {
+                    case QRMode.MODE_NUMBER:
+                        return 14;
+                    case QRMode.MODE_ALPHA_NUM:
+                        return 13;
+                    case QRMode.MODE_8BIT_BYTE:
+                        return 16;
+                    case QRMode.MODE_KANJI:
+                        return 12;
+                    default:
+                        throw new Error("mode:" + mode);
+                }
+
+            } else {
+                throw new Error("type:" + type);
+            }
+        },
+
+        getLostPoint: function(qrCode) {
+
+            var moduleCount = qrCode.getModuleCount();
+
+            var lostPoint = 0;
+
+            // LEVEL1
+
+            for (var row = 0; row < moduleCount; row++) {
+
+                for (var col = 0; col < moduleCount; col++) {
+
+                    var sameCount = 0;
+                    var dark = qrCode.isDark(row, col);
+
+                    for (var r = -1; r <= 1; r++) {
+
+                        if (row + r < 0 || moduleCount <= row + r) {
+                            continue;
+                        }
+
+                        for (var c = -1; c <= 1; c++) {
+
+                            if (col + c < 0 || moduleCount <= col + c) {
+                                continue;
+                            }
+
+                            if (r == 0 && c == 0) {
+                                continue;
+                            }
+
+                            if (dark == qrCode.isDark(row + r, col + c)) {
+                                sameCount++;
+                            }
+                        }
+                    }
+
+                    if (sameCount > 5) {
+                        lostPoint += (3 + sameCount - 5);
+                    }
+                }
+            }
+
+            // LEVEL2
+
+            for (var row = 0; row < moduleCount - 1; row++) {
+                for (var col = 0; col < moduleCount - 1; col++) {
+                    var count = 0;
+                    if (qrCode.isDark(row, col)) count++;
+                    if (qrCode.isDark(row + 1, col)) count++;
+                    if (qrCode.isDark(row, col + 1)) count++;
+                    if (qrCode.isDark(row + 1, col + 1)) count++;
+                    if (count == 0 || count == 4) {
+                        lostPoint += 3;
+                    }
+                }
+            }
+
+            // LEVEL3
+
+            for (var row = 0; row < moduleCount; row++) {
+                for (var col = 0; col < moduleCount - 6; col++) {
+                    if (qrCode.isDark(row, col) &&
+                        !qrCode.isDark(row, col + 1) &&
+                        qrCode.isDark(row, col + 2) &&
+                        qrCode.isDark(row, col + 3) &&
+                        qrCode.isDark(row, col + 4) &&
+                        !qrCode.isDark(row, col + 5) &&
+                        qrCode.isDark(row, col + 6)) {
+                        lostPoint += 40;
+                    }
+                }
+            }
+
+            for (var col = 0; col < moduleCount; col++) {
+                for (var row = 0; row < moduleCount - 6; row++) {
+                    if (qrCode.isDark(row, col) &&
+                        !qrCode.isDark(row + 1, col) &&
+                        qrCode.isDark(row + 2, col) &&
+                        qrCode.isDark(row + 3, col) &&
+                        qrCode.isDark(row + 4, col) &&
+                        !qrCode.isDark(row + 5, col) &&
+                        qrCode.isDark(row + 6, col)) {
+                        lostPoint += 40;
+                    }
+                }
+            }
+
+            // LEVEL4
+
+            var darkCount = 0;
+
+            for (var col = 0; col < moduleCount; col++) {
+                for (var row = 0; row < moduleCount; row++) {
+                    if (qrCode.isDark(row, col)) {
+                        darkCount++;
+                    }
+                }
+            }
+
+            var ratio = Math.abs(100 * darkCount / moduleCount / moduleCount - 50) / 5;
+            lostPoint += ratio * 10;
+
+            return lostPoint;
+        }
+
+    };
+
+
+    //---------------------------------------------------------------------
+    // QRMath
+    //---------------------------------------------------------------------
+
+    var QRMath = {
+
+        glog: function(n) {
+
+            if (n < 1) {
+                throw new Error("glog(" + n + ")");
+            }
+
+            return QRMath.LOG_TABLE[n];
+        },
+
+        gexp: function(n) {
+
+            while (n < 0) {
+                n += 255;
+            }
+
+            while (n >= 256) {
+                n -= 255;
+            }
+
+            return QRMath.EXP_TABLE[n];
+        },
+
+        EXP_TABLE: new Array(256),
+
+        LOG_TABLE: new Array(256)
+
+    };
+
+    for (var i = 0; i < 8; i++) {
+        QRMath.EXP_TABLE[i] = 1 << i;
+    }
+    for (var i = 8; i < 256; i++) {
+        QRMath.EXP_TABLE[i] = QRMath.EXP_TABLE[i - 4] ^
+            QRMath.EXP_TABLE[i - 5] ^
+            QRMath.EXP_TABLE[i - 6] ^
+            QRMath.EXP_TABLE[i - 8];
+    }
+    for (var i = 0; i < 255; i++) {
+        QRMath.LOG_TABLE[QRMath.EXP_TABLE[i]] = i;
+    }
+
+    //---------------------------------------------------------------------
+    // QRPolynomial
+    //---------------------------------------------------------------------
+
+    function QRPolynomial(num, shift) {
+
+        if (num.length == undefined) {
+            throw new Error(num.length + "/" + shift);
+        }
+
+        var offset = 0;
+
+        while (offset < num.length && num[offset] == 0) {
+            offset++;
+        }
+
+        this.num = new Array(num.length - offset + shift);
+        for (var i = 0; i < num.length - offset; i++) {
+            this.num[i] = num[i + offset];
+        }
+    }
+
+    QRPolynomial.prototype = {
+
+        get: function(index) {
+            return this.num[index];
+        },
+
+        getLength: function() {
+            return this.num.length;
+        },
+
+        multiply: function(e) {
+
+            var num = new Array(this.getLength() + e.getLength() - 1);
+
+            for (var i = 0; i < this.getLength(); i++) {
+                for (var j = 0; j < e.getLength(); j++) {
+                    num[i + j] ^= QRMath.gexp(QRMath.glog(this.get(i)) + QRMath.glog(e.get(j)));
+                }
+            }
+
+            return new QRPolynomial(num, 0);
+        },
+
+        mod: function(e) {
+
+            if (this.getLength() - e.getLength() < 0) {
+                return this;
+            }
+
+            var ratio = QRMath.glog(this.get(0)) - QRMath.glog(e.get(0));
+
+            var num = new Array(this.getLength());
+
+            for (var i = 0; i < this.getLength(); i++) {
+                num[i] = this.get(i);
+            }
+
+            for (var i = 0; i < e.getLength(); i++) {
+                num[i] ^= QRMath.gexp(QRMath.glog(e.get(i)) + ratio);
+            }
+
+            // recursive call
+            return new QRPolynomial(num, 0).mod(e);
+        }
+    };
+
+    //---------------------------------------------------------------------
+    // QRRSBlock
+    //---------------------------------------------------------------------
+
+    function QRRSBlock(totalCount, dataCount) {
+        this.totalCount = totalCount;
+        this.dataCount = dataCount;
+    }
+
+    QRRSBlock.RS_BLOCK_TABLE = [
+
+        // L
+        // M
+        // Q
+        // H
+
+        // 1
+        [1, 26, 19],
+        [1, 26, 16],
+        [1, 26, 13],
+        [1, 26, 9],
+
+        // 2
+        [1, 44, 34],
+        [1, 44, 28],
+        [1, 44, 22],
+        [1, 44, 16],
+
+        // 3
+        [1, 70, 55],
+        [1, 70, 44],
+        [2, 35, 17],
+        [2, 35, 13],
+
+        // 4        
+        [1, 100, 80],
+        [2, 50, 32],
+        [2, 50, 24],
+        [4, 25, 9],
+
+        // 5
+        [1, 134, 108],
+        [2, 67, 43],
+        [2, 33, 15, 2, 34, 16],
+        [2, 33, 11, 2, 34, 12],
+
+        // 6
+        [2, 86, 68],
+        [4, 43, 27],
+        [4, 43, 19],
+        [4, 43, 15],
+
+        // 7        
+        [2, 98, 78],
+        [4, 49, 31],
+        [2, 32, 14, 4, 33, 15],
+        [4, 39, 13, 1, 40, 14],
+
+        // 8
+        [2, 121, 97],
+        [2, 60, 38, 2, 61, 39],
+        [4, 40, 18, 2, 41, 19],
+        [4, 40, 14, 2, 41, 15],
+
+        // 9
+        [2, 146, 116],
+        [3, 58, 36, 2, 59, 37],
+        [4, 36, 16, 4, 37, 17],
+        [4, 36, 12, 4, 37, 13],
+
+        // 10        
+        [2, 86, 68, 2, 87, 69],
+        [4, 69, 43, 1, 70, 44],
+        [6, 43, 19, 2, 44, 20],
+        [6, 43, 15, 2, 44, 16],
+
+        // 11
+        [4, 101, 81],
+        [1, 80, 50, 4, 81, 51],
+        [4, 50, 22, 4, 51, 23],
+        [3, 36, 12, 8, 37, 13],
+
+        // 12
+        [2, 116, 92, 2, 117, 93],
+        [6, 58, 36, 2, 59, 37],
+        [4, 46, 20, 6, 47, 21],
+        [7, 42, 14, 4, 43, 15],
+
+        // 13
+        [4, 133, 107],
+        [8, 59, 37, 1, 60, 38],
+        [8, 44, 20, 4, 45, 21],
+        [12, 33, 11, 4, 34, 12],
+
+        // 14
+        [3, 145, 115, 1, 146, 116],
+        [4, 64, 40, 5, 65, 41],
+        [11, 36, 16, 5, 37, 17],
+        [11, 36, 12, 5, 37, 13],
+
+        // 15
+        [5, 109, 87, 1, 110, 88],
+        [5, 65, 41, 5, 66, 42],
+        [5, 54, 24, 7, 55, 25],
+        [11, 36, 12],
+
+        // 16
+        [5, 122, 98, 1, 123, 99],
+        [7, 73, 45, 3, 74, 46],
+        [15, 43, 19, 2, 44, 20],
+        [3, 45, 15, 13, 46, 16],
+
+        // 17
+        [1, 135, 107, 5, 136, 108],
+        [10, 74, 46, 1, 75, 47],
+        [1, 50, 22, 15, 51, 23],
+        [2, 42, 14, 17, 43, 15],
+
+        // 18
+        [5, 150, 120, 1, 151, 121],
+        [9, 69, 43, 4, 70, 44],
+        [17, 50, 22, 1, 51, 23],
+        [2, 42, 14, 19, 43, 15],
+
+        // 19
+        [3, 141, 113, 4, 142, 114],
+        [3, 70, 44, 11, 71, 45],
+        [17, 47, 21, 4, 48, 22],
+        [9, 39, 13, 16, 40, 14],
+
+        // 20
+        [3, 135, 107, 5, 136, 108],
+        [3, 67, 41, 13, 68, 42],
+        [15, 54, 24, 5, 55, 25],
+        [15, 43, 15, 10, 44, 16],
+
+        // 21
+        [4, 144, 116, 4, 145, 117],
+        [17, 68, 42],
+        [17, 50, 22, 6, 51, 23],
+        [19, 46, 16, 6, 47, 17],
+
+        // 22
+        [2, 139, 111, 7, 140, 112],
+        [17, 74, 46],
+        [7, 54, 24, 16, 55, 25],
+        [34, 37, 13],
+
+        // 23
+        [4, 151, 121, 5, 152, 122],
+        [4, 75, 47, 14, 76, 48],
+        [11, 54, 24, 14, 55, 25],
+        [16, 45, 15, 14, 46, 16],
+
+        // 24
+        [6, 147, 117, 4, 148, 118],
+        [6, 73, 45, 14, 74, 46],
+        [11, 54, 24, 16, 55, 25],
+        [30, 46, 16, 2, 47, 17],
+
+        // 25
+        [8, 132, 106, 4, 133, 107],
+        [8, 75, 47, 13, 76, 48],
+        [7, 54, 24, 22, 55, 25],
+        [22, 45, 15, 13, 46, 16],
+
+        // 26
+        [10, 142, 114, 2, 143, 115],
+        [19, 74, 46, 4, 75, 47],
+        [28, 50, 22, 6, 51, 23],
+        [33, 46, 16, 4, 47, 17],
+
+        // 27
+        [8, 152, 122, 4, 153, 123],
+        [22, 73, 45, 3, 74, 46],
+        [8, 53, 23, 26, 54, 24],
+        [12, 45, 15, 28, 46, 16],
+
+        // 28
+        [3, 147, 117, 10, 148, 118],
+        [3, 73, 45, 23, 74, 46],
+        [4, 54, 24, 31, 55, 25],
+        [11, 45, 15, 31, 46, 16],
+
+        // 29
+        [7, 146, 116, 7, 147, 117],
+        [21, 73, 45, 7, 74, 46],
+        [1, 53, 23, 37, 54, 24],
+        [19, 45, 15, 26, 46, 16],
+
+        // 30
+        [5, 145, 115, 10, 146, 116],
+        [19, 75, 47, 10, 76, 48],
+        [15, 54, 24, 25, 55, 25],
+        [23, 45, 15, 25, 46, 16],
+
+        // 31
+        [13, 145, 115, 3, 146, 116],
+        [2, 74, 46, 29, 75, 47],
+        [42, 54, 24, 1, 55, 25],
+        [23, 45, 15, 28, 46, 16],
+
+        // 32
+        [17, 145, 115],
+        [10, 74, 46, 23, 75, 47],
+        [10, 54, 24, 35, 55, 25],
+        [19, 45, 15, 35, 46, 16],
+
+        // 33
+        [17, 145, 115, 1, 146, 116],
+        [14, 74, 46, 21, 75, 47],
+        [29, 54, 24, 19, 55, 25],
+        [11, 45, 15, 46, 46, 16],
+
+        // 34
+        [13, 145, 115, 6, 146, 116],
+        [14, 74, 46, 23, 75, 47],
+        [44, 54, 24, 7, 55, 25],
+        [59, 46, 16, 1, 47, 17],
+
+        // 35
+        [12, 151, 121, 7, 152, 122],
+        [12, 75, 47, 26, 76, 48],
+        [39, 54, 24, 14, 55, 25],
+        [22, 45, 15, 41, 46, 16],
+
+        // 36
+        [6, 151, 121, 14, 152, 122],
+        [6, 75, 47, 34, 76, 48],
+        [46, 54, 24, 10, 55, 25],
+        [2, 45, 15, 64, 46, 16],
+
+        // 37
+        [17, 152, 122, 4, 153, 123],
+        [29, 74, 46, 14, 75, 47],
+        [49, 54, 24, 10, 55, 25],
+        [24, 45, 15, 46, 46, 16],
+
+        // 38
+        [4, 152, 122, 18, 153, 123],
+        [13, 74, 46, 32, 75, 47],
+        [48, 54, 24, 14, 55, 25],
+        [42, 45, 15, 32, 46, 16],
+
+        // 39
+        [20, 147, 117, 4, 148, 118],
+        [40, 75, 47, 7, 76, 48],
+        [43, 54, 24, 22, 55, 25],
+        [10, 45, 15, 67, 46, 16],
+
+        // 40
+        [19, 148, 118, 6, 149, 119],
+        [18, 75, 47, 31, 76, 48],
+        [34, 54, 24, 34, 55, 25],
+        [20, 45, 15, 61, 46, 16]
+    ];
+
+    QRRSBlock.getRSBlocks = function(typeNumber, errorCorrectLevel) {
+
+        var rsBlock = QRRSBlock.getRsBlockTable(typeNumber, errorCorrectLevel);
+
+        if (rsBlock == undefined) {
+            throw new Error("bad rs block @ typeNumber:" + typeNumber + "/errorCorrectLevel:" + errorCorrectLevel);
+        }
+
+        var length = rsBlock.length / 3;
+
+        var list = new Array();
+
+        for (var i = 0; i < length; i++) {
+
+            var count = rsBlock[i * 3 + 0];
+            var totalCount = rsBlock[i * 3 + 1];
+            var dataCount = rsBlock[i * 3 + 2];
+
+            for (var j = 0; j < count; j++) {
+                list.push(new QRRSBlock(totalCount, dataCount));
+            }
+        }
+
+        return list;
+    }
+
+    QRRSBlock.getRsBlockTable = function(typeNumber, errorCorrectLevel) {
+
+        switch (errorCorrectLevel) {
+            case QRErrorCorrectLevel.L:
+                return QRRSBlock.RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 0];
+            case QRErrorCorrectLevel.M:
+                return QRRSBlock.RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 1];
+            case QRErrorCorrectLevel.Q:
+                return QRRSBlock.RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 2];
+            case QRErrorCorrectLevel.H:
+                return QRRSBlock.RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 3];
+            default:
+                return undefined;
+        }
+    }
+
+    //---------------------------------------------------------------------
+    // QRBitBuffer
+    //---------------------------------------------------------------------
+
+    function QRBitBuffer() {
+        this.buffer = new Array();
+        this.length = 0;
+    }
+
+    QRBitBuffer.prototype = {
+
+        get: function(index) {
+            var bufIndex = Math.floor(index / 8);
+            return ((this.buffer[bufIndex] >>> (7 - index % 8)) & 1) == 1;
+        },
+
+        put: function(num, length) {
+            for (var i = 0; i < length; i++) {
+                this.putBit(((num >>> (length - i - 1)) & 1) == 1);
+            }
+        },
+
+        getLengthInBits: function() {
+            return this.length;
+        },
+
+        putBit: function(bit) {
+
+            var bufIndex = Math.floor(this.length / 8);
+            if (this.buffer.length <= bufIndex) {
+                this.buffer.push(0);
+            }
+
+            if (bit) {
+                this.buffer[bufIndex] |= (0x80 >>> (this.length % 8));
+            }
+
+            this.length++;
+        }
+    };
+
+    //---------------------------------------------------------------------
+    // Support Chinese
+    //---------------------------------------------------------------------
+    function utf16To8(text) {
+        var result = '';
+        var c;
+        for (var i = 0; i < text.length; i++) {
+            c = text.charCodeAt(i);
+            if (c >= 0x0001 && c <= 0x007F) {
+                result += text.charAt(i);
+            } else if (c > 0x07FF) {
+                result += String.fromCharCode(0xE0 | c >> 12 & 0x0F);
+                result += String.fromCharCode(0x80 | c >> 6 & 0x3F);
+                result += String.fromCharCode(0x80 | c >> 0 & 0x3F);
+            } else {
+                result += String.fromCharCode(0xC0 | c >> 6 & 0x1F);
+                result += String.fromCharCode(0x80 | c >> 0 & 0x3F);
+            }
+        }
+        return result;
+    }
+
+    uQRCode = {
+
+        errorCorrectLevel: QRErrorCorrectLevel,
+
+        defaults: {
+            size: 354,
+            margin: 0,
+            backgroundColor: '#ffffff',
+            foregroundColor: '#000000',
+            fileType: 'png', // 'jpg', 'png'
+            errorCorrectLevel: QRErrorCorrectLevel.H,
+            typeNumber: -1
+        },
+
+        make: function(options) {
+            return new Promise((reslove, reject) => {
+                var defaultOptions = {
+                    canvasId: options.canvasId,
+                    componentInstance: options.componentInstance,
+                    text: options.text,
+                    size: this.defaults.size,
+                    margin: this.defaults.margin,
+                    backgroundColor: this.defaults.backgroundColor,
+                    foregroundColor: this.defaults.foregroundColor,
+                    fileType: this.defaults.fileType,
+                    errorCorrectLevel: this.defaults.errorCorrectLevel,
+                    typeNumber: this.defaults.typeNumber
+                };
+                if (options) {
+                    for (var i in options) {
+                        defaultOptions[i] = options[i];
+                    }
+                }
+                options = defaultOptions;
+                if (!options.canvasId) {
+                    console.error('uQRCode: Please set canvasId!');
+                    return;
+                }
+
+                function createCanvas() {
+                    var qrcode = new QRCode(options.typeNumber, options.errorCorrectLevel);
+                    qrcode.addData(utf16To8(options.text));
+                    qrcode.make();
+
+                    var ctx = uni.createCanvasContext(options.canvasId, options.componentInstance);
+                    ctx.setFillStyle(options.backgroundColor);
+                    ctx.fillRect(0, 0, options.size, options.size);
+
+                    var tileW = (options.size - options.margin * 2) / qrcode.getModuleCount();
+                    var tileH = tileW;
+
+                    for (var row = 0; row < qrcode.getModuleCount(); row++) {
+                        for (var col = 0; col < qrcode.getModuleCount(); col++) {
+                            var style = qrcode.isDark(row, col) ? options.foregroundColor : options.backgroundColor;
+                            ctx.setFillStyle(style);
+                            var x = Math.round(col * tileW) + options.margin;
+                            var y = Math.round(row * tileH) + options.margin;
+                            var w = Math.ceil((col + 1) * tileW) - Math.floor(col * tileW);
+                            var h = Math.ceil((row + 1) * tileW) - Math.floor(row * tileW);
+                            ctx.fillRect(x, y, w, h);
+                        }
+                    }
+
+                    setTimeout(function() {
+                        ctx.draw(false, (function() {
+                            setTimeout(function() {
+                                uni.canvasToTempFilePath({
+                                    canvasId: options.canvasId,
+                                    fileType: options.fileType,
+                                    width: options.size,
+                                    height: options.size,
+                                    destWidth: options.size,
+                                    destHeight: options.size,
+                                    success: function(res) {
+                                        let resData; // 将统一为base64格式
+                                        let tempFilePath = res.tempFilePath; // H5为base64，其他为相对路径
+
+                                        // #ifdef H5
+                                        resData = tempFilePath;
+                                        options.success && options.success(resData);
+                                        reslove(resData);
+                                        // #endif
+
+                                        // #ifdef APP-PLUS
+                                        const path = plus.io.convertLocalFileSystemURL(tempFilePath) // 绝对路径
+                                        let fileReader = new plus.io.FileReader();
+                                        fileReader.readAsDataURL(path);
+                                        fileReader.onloadend = res => {
+                                            resData = res.target.result;
+                                            options.success && options.success(resData);
+                                            reslove(resData);
+                                        };
+                                        // #endif
+
+                                        // #ifdef MP-WEIXIN || MP-QQ || MP-TOUTIAO
+                                        uni.getFileSystemManager().readFile({
+                                            filePath: tempFilePath,
+                                            encoding: 'base64',
+                                            success: res => {
+                                                resData = 'data:image/png;base64,' + res.data;
+                                                options.success && options.success(resData);
+                                                reslove(resData);
+                                            }
+                                        })
+                                        // #endif
+
+                                        // #ifndef H5 || APP-PLUS || MP-WEIXIN || MP-QQ || MP-TOUTIAO
+                                        if (plus) {
+                                            const path = plus.io.convertLocalFileSystemURL(tempFilePath) // 绝对路径
+                                            let fileReader = new plus.io.FileReader();
+                                            fileReader.readAsDataURL(path);
+                                            fileReader.onloadend = res => {
+                                                resData = res.target.result;
+                                                options.success && options.success(resData);
+                                                reslove(resData);
+                                            };
+                                        } else {
+                                            uni.request({
+                                                url: tempFilePath,
+                                                method: 'GET',
+                                                responseType: 'arraybuffer',
+                                                success: res => {
+                                                    resData = `data:image/png;base64,${uni.arrayBufferToBase64(res.data)}`; // 把arraybuffer转成base64
+                                                    options.success && options.success(resData);
+                                                    reslove(resData);
+                                                }
+                                            })
+                                        }
+                                        // #endif
+                                    },
+                                    fail: function(error) {
+                                        options.fail && options.fail(error);
+                                        reject(error);
+                                    },
+                                    complete: function(res) {
+                                        options.complete && options.complete(res);
+                                    }
+                                }, options.componentInstance);
+                            }, options.text.length + 100);
+                        })());
+                    }, 150);
+                }
+
+                createCanvas();
+            });
+        }
+    }
+
+})()
+
+export default uQRCode
diff --git a/page_moban/addsheshi.vue b/page_moban/addsheshi.vue
index 81fa981..40836ec 100644
--- a/page_moban/addsheshi.vue
+++ b/page_moban/addsheshi.vue
@@ -28,7 +28,7 @@
 					22155221
 				</view>
 			</view>
-			<view class="ulbox" style="border-bottom: none;">
+			<view class="ulbox" style="border-bottom: none;" @click="btnsf">
 				<view class="one">
 					收费方式
 				</view>
@@ -36,7 +36,7 @@
 					套餐1
 				</view>
 			</view>
-			<view class="shichang">
+			<view class="shichang" @click="btnsf">
 				<view class="stop">
 					<view class="">
 						套餐时长
@@ -80,7 +80,12 @@
 
 		},
 		methods: {
-			
+			// 点击跳转到收费方式页
+			btnsf(){
+				uni.navigateTo({
+					url:'/page_moban/shoufei'
+				})
+			}
 		}
 	}
 </script>
diff --git a/page_moban/toufcesuo.vue b/page_moban/toufcesuo.vue
new file mode 100644
index 0000000..a43809e
--- /dev/null
+++ b/page_moban/toufcesuo.vue
@@ -0,0 +1,387 @@
+<template>
+	<view class="page">
+		<u-navbar title="设备信息" :border-bottom="false" :background="bgc" back-icon-color="#262B37" title-color='#262B37'
+			title-size='36' height='48' id="navbar">
+		</u-navbar>
+        <view class="box">
+        	<view class="ulbox">
+        		<view class="one">
+        			设备名称
+        		</view>
+				<view class="two">
+					卫生间门
+				</view>
+        	</view>
+			<view class="ulbox" style="border: none;" @click="showthr = true">
+				<view class="one">
+					开锁条件 
+				</view>
+				<view class="two">
+					{{kstj}} <image src="https://api.ccttiot.com/smartmeter/img/static/uS5JydUQDmvbMyg4nsdo" mode=""></image>
+				</view>
+			</view>
+			<u-select v-model="showthr" :list="listthr" @confirm="btnthr"></u-select>
+			
+			<view class="anniu">
+				<view class="tougang" @click="btnshop">
+					确认投放
+				</view>
+			</view>
+        </view>
+		
+		<view class="box">
+			<view class="ulbox">
+				<view class="one">
+					设备型号
+				</view>
+				<view class="two">
+					{{xxobj.model == null ? '--' : xxobj.model}} 
+				</view>
+			</view>
+			<view class="ulbox">
+				<view class="one">
+					设备编号
+				</view>
+				<view class="two">
+					{{xxobj.sn == null ? '--' : xxobj.sn}} 
+				</view>
+			</view>
+			<view class="ulbox">
+				<view class="one">
+					设备状态
+				</view>
+				<view class="two">
+					<view class="two" v-if="xxobj.placementStatus == 1">
+						已投放
+					</view>
+					<view class="two" v-if="xxobj.placementStatus == 2">
+						未投放
+					</view>
+				</view>
+			</view>
+			<view class="ulbox">
+				<view class="one">
+					版本号
+				</view>
+				<view class="two">
+					{{xxobj.version == null ? '--' : xxobj.version}}
+				</view>
+			</view>
+			<view class="ulbox" style="border-bottom: none;">
+				<view class="one">
+					联网状态
+				</view>
+				<view class="two">
+					{{xxobj.onlineStatus == 1 ? '在线' : '离线'}}  
+				</view>
+			</view>
+		</view>
+		
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+                bgc: {
+                	backgroundColor: "#fff",
+                },
+				listthr:[
+				{
+					value: '1',
+					label: '有当前订单可进入'
+				},{
+					value: '2',
+					label: '有历史订单可进入'
+				},{
+					value: '3',
+					label: '无条件'
+				}],
+				showthr:false,
+				xxobj:{},
+				storeId:'',
+				sn:'',
+				ksfs:'',
+				kstime:'',
+				kstj:'',
+				ksfsid:'',
+				kstjid:''
+			}
+		},
+		onLoad(option) {
+            this.storeId = option.storeId
+			this.sn = option.sn
+			this.getxx()
+		},
+		methods: {
+			// 点击选择门店
+			btnshop(){
+				let that = this
+				uni.showModal({
+					title: '提示',
+					content: '您确认要投放吗？',
+					success: function(res) {
+						if (res.confirm) {
+							
+						}
+					}
+				})
+			},
+			// 确认开锁条件
+			btnthr(e){
+				this.kstj = e[0].label
+				this.kstjid = e[0].value
+			},
+			// 获取设备信息
+			getxx(){
+				this.$u.get(`/app/device/${this.sn}/bySn`).then(res => {
+					if (res.code == 200) {
+						this.xxobj = res.data
+					}
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	/deep/ .u-iconfont,
+	/deep/ .u-title{
+		padding-bottom: 20rpx;
+		box-sizing: border-box;
+	}
+	.jieb{
+		width: 750rpx;
+		height: 152rpx;
+		background: #FFFFFF;
+		box-shadow: 0rpx 8rpx 20rpx 0rpx rgba(0,0,0,0.3);
+		border-radius: 0rpx 0rpx 0rpx 0rpx;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		.bt{
+			width: 680rpx;
+			height: 104rpx;
+			background: #48893B;
+			margin: auto;
+			margin-top: 24rpx;
+			border-radius: 24rpx;
+			font-weight: 600;
+			font-size: 36rpx;
+			color: #FFFFFF;
+			text-align: center;
+			line-height: 104rpx;
+		}
+	}
+	.lianwang{
+		width: 680rpx;
+		height: 112rpx;
+		background: #FFFFFF;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin: auto;
+		margin-top: 22rpx;
+		border-radius: 24rpx;
+		padding: 36rpx 32rpx;
+		box-sizing: border-box;
+		.two{
+			font-size: 32rpx;
+			color: #7C7C7C;
+		}
+		.thr{
+			font-size: 32rpx;
+			color: #3D3D3D;
+			display: flex;
+			align-items: center;
+			image{
+				width: 12rpx;
+				height: 34rpx;
+				margin-left: 10rpx;
+			}
+		}
+	}
+	.jichuxx{
+		width: 680rpx;
+		max-height: 458rpx;
+		background: #FFFFFF;
+		box-sizing: border-box;
+		padding: 44rpx 34rpx;
+		box-sizing: border-box;
+		margin: auto;
+		margin-top: 22rpx;
+		border-radius: 20rpx;
+		.top{
+			border-left: 14rpx solid #48893B;
+			font-weight: 600;
+			font-size: 36rpx;
+			color: #3D3D3D;
+			padding-left: 24rpx;
+			box-sizing: border-box;
+		}
+		.one{
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-top: 28rpx;
+			.two{
+				font-size: 32rpx;
+				color: #7C7C7C;
+			}
+			.thr{
+				font-size: 32rpx;
+				color: #3D3D3D;
+			}
+		}
+	}
+	.toufangbox{
+		width: 680rpx;
+		height: 284rpx;
+		background: #FFFFFF;
+		border-radius: 24rpx 24rpx 24rpx 24rpx;
+		margin: auto;
+		margin-top: 22rpx;
+		padding: 44rpx 34rpx;
+		box-sizing: border-box;
+		.shebeibj{
+			display: flex;
+			justify-content: space-between;
+			.lt{
+				.name{
+					font-weight: 600;
+					font-size: 40rpx;
+					color: #262B37;
+				}
+				.zt{
+					font-size: 28rpx;
+					color: #5B5B5B;
+					margin-top: 12rpx;
+					text{
+						color: #00BA88;
+					}
+				}
+			}
+			.rt{
+				image{
+					width: 196rpx;
+					height: 196rpx;
+				}
+			}
+		}
+	}
+	.xuanze{
+		width: 750rpx;
+		height: 494rpx;
+		background: #FFFFFF;
+		border-radius: 40rpx 40rpx 0 0;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		z-index: 1;
+		padding: 42rpx 62rpx;
+		box-sizing: border-box;
+		.changj{
+			display: flex;
+			justify-content: space-between;
+			flex-wrap: wrap;
+			.changj_item{
+				width: 302rpx;
+				height: 110rpx;
+				background: #F0F0F0;
+				border-radius: 6rpx 6rpx 6rpx 6rpx;
+				font-weight: 600;
+				text-align: center;
+				line-height: 110rpx;
+				font-size: 36rpx;
+				margin-top: 40rpx;
+				color: #3D3D3D;
+			}
+		}
+		.top{
+			display: flex;
+			justify-content: space-between;
+			view{
+				font-weight: 600;
+				font-size: 36rpx;
+				color: #3D3D3D;
+				image{
+					width: 50rpx;
+					height: 50rpx;
+				}
+			}
+		}
+	}
+	.mask{
+		width: 100%;
+		height: 100vh;
+		background-color: #000;
+		opacity: .3;
+		position: fixed;
+		top: 0;
+		left: 0;
+	}
+	.anniu{
+		width: 100%;
+		height: 152rpx;
+		background: #FFFFFF;
+		box-shadow: 0rpx 8rpx 20rpx 0rpx rgba(0,0,0,0.3);
+		border-radius: 0rpx 0rpx 0rpx 0rpx;
+		display: flex;
+		padding: 24rpx 36rpx;
+		box-sizing: border-box;
+		justify-content: space-between;
+		text-align: center;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		.tougang{
+			width: 680rpx;
+			margin: auto;
+			height: 104rpx;
+			background: #48893B;
+			font-size: 36rpx;
+			color: #FFFFFF;
+			line-height: 104rpx;
+			border-radius: 20rpx;
+		}
+	}
+	.box{
+		width: 680rpx;
+		max-height: 708rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		margin: auto;
+		margin-top: 28rpx;
+		padding: 0 30rpx;
+		box-sizing: border-box;
+		.ulbox{
+			width: 100%;
+			height: 118rpx;
+			line-height: 118rpx;
+			display: flex;
+			justify-content: space-between;
+			border-bottom: 1px solid #D8D8D8;
+			.one{
+				font-size: 32rpx;
+				color: #3D3D3D;
+			}
+			.two{
+				font-size: 32rpx;
+				color: #7C7C7C;
+				display: flex;
+				align-items: center;
+				image{
+					width: 14rpx;
+					height: 42rpx;
+					margin-left: 20rpx;
+				}
+			}
+		}
+	}
+	page {
+		background: #F6F6F6;
+	}
+
+</style>
\ No newline at end of file
diff --git a/page_shanghu/bangding.vue b/page_shanghu/bangding.vue
index 3c4c1d3..c1fa2b0 100644
--- a/page_shanghu/bangding.vue
+++ b/page_shanghu/bangding.vue
@@ -25,60 +25,66 @@
 					<image src="https://api.ccttiot.com/smartmeter/img/static/uZNimi3DEsGWsjfJm2Bg" mode=""></image>
 				</view>
 			</view>
+			<!-- 店门 --><!-- 店门 --><!-- 店门 --><!-- 店门 --><!-- 店门 --><!-- 店门 --><!-- 店门 --><!-- 店门 --><!-- 店门 --><!-- 店门 --><!-- 店门 --><!-- 店门 -->
 			<view class="damen">
 				<view class="name">
 					店门
 				</view>
-				<view class="menbj">
+				<view class="menbj" :id="objxq.gateSn == null ? 'active' : ''" @click="btnmendian">
 					<view class="top">
 						<view class="lt">
 							<text style="font-weight: 600;font-size: 32rpx;">店门</text> 
 						</view>
-						<view class="rt">
-							<text></text> 已绑定
+						<view class="rt" :id="objxq.gateSn == null ? 'active' : ''">
+							<text :id="objxq.gateSn == null ? 'active' : ''"></text> {{objxq.gateSn == null ? '未绑定' : '已绑定'}}
 						</view>
 					</view>
-					<view class="bot">
+					<view class="bot" v-if="objxq.gateSn != null">
 						<view class="lt">
 							有当前订单才能进入门店
 						</view>
 						<view class="rt">
-							SN：12154522544
+							SN：{{objxq.gateSn}}
 						</view>
 					</view>
 				</view>
 			</view>
-			<view class="damen">
-				<view class="name">
-					房间
-				</view>
-				<view class="fjlist">
-					<view class="fj_item" v-for="(itemr,index) in 3" :key="index">
-						<view class="name">
-							<text>房间</text>  <text style="font-size: 28rpx;color: #3D3D3D;"> <text style="margin-bottom: 6rpx;"></text> 已绑定</text>
-						</view>
-						<view class="zt">
-							SN：22451254
+			<!-- 房间 --><!-- 房间 --><!-- 房间 --><!-- 房间 --><!-- 房间 --><!-- 房间 --><!-- 房间 --><!-- 房间 --><!-- 房间 --><!-- 房间 --><!-- 房间 --><!-- 房间 -->
+			<view class="">
+				<view class="damen" v-for="(item,index) in roomList" :key="index">
+					<view class="name">
+						{{item.storeName}}
+					</view>
+					<view class="fjlist">
+						<view class="fj_item" v-for="(val,index) in item.equipmentList" :key="index" @click="btnfj(index)" :id="val.deviceList[0].sn == null ? 'active' : ''">
+							<view class="name">
+								<text :id="val.deviceList[0].sn == null ? 'active' : ''">{{val.name}}</text>  <text style="font-size: 28rpx;color: #3D3D3D;" :id="val.deviceList[0].sn == null ? 'active' : ''">
+								 <text style="margin-bottom: 6rpx;" :id="val.deviceList[0].sn == null ? 'active' : ''"></text> {{val.deviceList[0].sn == null ? '未绑定' : '已绑定'}}</text>
+							</view>
+							<view class="zt" v-if="val.deviceList[0].sn != null">
+								SN：{{val.deviceList[0].sn}}
+							</view>
 						</view>
 					</view>
 				</view>
 			</view>
+			<!-- 大厅 --><!-- 大厅 --><!-- 大厅 --><!-- 大厅 --><!-- 大厅 --><!-- 大厅 --><!-- 大厅 --><!-- 大厅 --><!-- 大厅 --><!-- 大厅 --><!-- 大厅 --><!-- 大厅 -->
 			<view class="damen">
 				<view class="name">
 					大厅
 				</view>
-				<view class="menbj">
+				<view class="menbj" v-for="(item,index) in datingobj.equipmentList" :key="index" :id="item.deviceList[0].sn == null ? 'active' : ''" @click="btndating(index)">
 					<view class="top">
-						<view class="lt">
-							<text style="font-weight: 600;">1号桌</text> 
+						<view class="lt" :id="item.deviceList[0].sn == null ? 'active' : ''">
+							<text style="font-weight: 600;" :id="item.deviceList[0].sn == null ? 'active' : ''">{{item.name}}</text> 
 						</view>
-						<view class="rt">
-							<text></text> 已绑定
+						<view class="rt" :id="item.deviceList[0].sn == null ? 'active' : ''">
+							<text :id="item.deviceList[0].sn == null ? 'active' : ''"></text> {{item.deviceList[0].sn == null ? '未绑定' : '已绑定'}}
 						</view>
 					</view>
-					<view class="bot">
-						<view class="lt">
-							SN：2234681537
+					<view class="bot" v-if="item.deviceList[0].sn != null">
+						<view class="lt" :id="item.deviceList[0].sn == null ? 'active' : ''">
+							SN：{{item.deviceList[0].sn}}
 						</view>
 						<view class="rt">
 							
@@ -86,52 +92,33 @@
 					</view>
 				</view>
 			</view>
+			<!-- 厕所 --><!-- 厕所 --><!-- 厕所 --><!-- 厕所 --><!-- 厕所 --><!-- 厕所 --><!-- 厕所 --><!-- 厕所 --><!-- 厕所 -->
 			<view class="damen">
 				<view class="name">
 					卫生间配置
 				</view>
-				<view class="menbj" style="background-color: #DEF1DA;">
-					<view class="top">
-						<view class="lt">
-							<text style="font-weight: 600;color: #48893B;">卫生间</text> 
+				<view class="" v-for="(val,index) in cesuolist" :key="index">
+					<view class="menbj" v-for="(item,index) in val.equipmentList" :key="index" :id="item.deviceList[0].sn == null ? 'active' : ''" @click="btncesuo(index)">
+						<view class="top">
+							<view class="lt" :id="item.deviceList[0].sn == null ? 'active' : ''">
+								<text style="font-weight: 600;" :id="item.deviceList[0].sn == null ? 'active' : ''">{{item.name}}</text> 
+							</view>
+							<view class="rt" :id="item.deviceList[0].sn == null ? 'active' : ''">
+								<text :id="item.deviceList[0].sn == null ? 'active' : ''"></text> {{item.deviceList[0].sn == null ? '未绑定' : '已绑定'}}
+							</view>
 						</view>
-						<view class="rt" style="color: #48893B;" >
-							<text style="background-color: #48893B;"></text> 未绑定
-						</view>
-					</view>
-				</view>
-				<view class="menbj" v-if="false">
-					<view class="top">
-						<view class="lt">
-							<text style="font-weight: 600;">卫生间</text> 
-						</view>
-						<view class="rt" style="color: #48893B;" >
-							<text style="background-color: #48893B;"></text> 未绑定
+						<view class="bot" v-if="item.deviceList[0].sn != null">
+							<view class="lt" :id="item.deviceList[0].sn == null ? 'active' : ''">
+								SN：{{item.deviceList[0].sn}}
+							</view>
+							<view class="rt">
+								
+							</view>
 						</view>
 					</view>
 				</view>
 			</view>
 		</view>
-		
-		<!-- <view class="mask" v-if="xuanzeflag"></view>
-		<view class="xuanze" v-if="xuanzeflag">
-			<view class="top">
-				<view>选择使用场景</view>
-				<view @click="xuanzeflag = false"><image src="https://api.ccttiot.com/smartmeter/img/static/uAd1csWlbqF423arI5b6" mode=""></image></view>
-			</view>
-			<view class="changj">
-				<view class="changj_item" @click="btnshop(1)">
-					自助棋牌
-				</view>
-				<view class="changj_item" @click="btnshop(2)">
-					共享棋牌
-				</view>
-				<view class="changj_item" @click="btnshop(3)">
-					自助台球
-				</view>
-			</view>
-		</view> -->
-		
 	</view>
 </template>
 
@@ -143,19 +130,218 @@
 					backgroundColor: "#fff",
 				},
 				storeId: '',
-				xuanzeflag:false
+				xuanzeflag:false,
+				roomList: [],
+				datingobj:{},
+				cesuolist:[],
+				list: [],
+				show: false,
+				roomId: '',
+				gateSnobj:{},
+				objxq:{},
+				deviceId:''
 			}
 		},
 		onLoad(option) {
 			this.storeId = option.storeId
+			this.deviceId = option.deviceId
 			this.getxq()
 		},
 		methods: {
+			// 点击门店是否绑定
+			btnmendian(){
+				if(this.objxq.gateSn == null){
+					let that = this
+					uni.showModal({
+						    title: '温馨提示',  
+						    content: '您确定要绑定到该设施上吗?',  
+						    success: function (res) {  
+						        if (res.confirm) {
+									let data = {
+										storeId:that.storeId,
+										sn:that.deviceId
+									}
+					                that.$u.put(`/app/room/bandDoor`,data).then(res => {
+										if(res.code == 200){
+											uni.showToast({
+											    title: '绑定成功',
+											    icon: 'success',
+											    duration:2000
+											})
+											that.getxq()
+										}else{
+											uni.showToast({
+											    title: res.msg,
+											    icon: 'none',
+											    duration:2000
+											})
+										}
+									})
+						        } else if (res.cancel) {
+						          
+						    }  
+						}  
+					})
+				}else{
+					uni.showToast({
+					    title: '该设施已被绑定',
+					    icon: 'none',
+					    duration:2000
+					})
+				}
+			},
+			// 点击房间是否绑定
+			btnfj(index){
+			    let deviceIds = this.roomList?.[0]?.equipmentList?.[index]?.deviceList?.[0]?.deviceId ?? null
+				let equipmentId = this.roomList[0].equipmentList[index].equipmentId
+				console.log(deviceIds,equipmentId,'房间');
+				if(deviceIds == null){
+					let that = this
+					uni.showModal({
+						    title: '温馨提示',  
+						    content: '您确定要绑定到该设施上吗?',  
+						    success: function (res) {  
+						        if (res.confirm) {
+					                that.$u.post(`/app/device/placement/${equipmentId}/${that.deviceId}`).then(res => {
+										if(res.code == 200){
+											uni.showToast({
+											    title: '绑定成功',
+											    icon: 'success',
+											    duration:2000
+											})
+											that.getxq()
+										}else{
+											uni.showToast({
+											    title: res.msg,
+											    icon: 'none',
+											    duration:2000
+											})
+										}
+									})
+						        } else if (res.cancel) {
+						          
+						    }  
+						}  
+					})
+				}else{
+					uni.showToast({
+					    title: '该设施已被绑定',
+					    icon: 'none',
+					    duration:2000
+					})
+				}
+			},
+			// 点击大厅是否绑定
+			btndating(index){
+				let deviceIds = this.datingobj?.equipmentList?.[index]?.deviceList?.[0]?.deviceId ?? null
+				let equipmentId = this.datingobj.equipmentList[index].equipmentId
+				console.log(deviceIds,equipmentId,'大厅');
+				if(deviceIds == null){
+					let that = this
+					uni.showModal({
+						    title: '温馨提示',  
+						    content: '您确定要绑定到该设施上吗?',  
+						    success: function (res) {  
+						        if (res.confirm) {
+					                that.$u.post(`/app/device/placement/${equipmentId}/${that.deviceId}`).then(res => {
+										if(res.code == 200){
+											uni.showToast({
+											    title: '绑定成功',
+											    icon: 'success',
+											    duration:2000
+											})
+											that.getxq()
+										}else{
+											uni.showToast({
+											    title: res.msg,
+											    icon: 'none',
+											    duration:2000
+											})
+										}
+									})
+						        } else if (res.cancel) {
+						          
+						    }  
+						}  
+					})
+				}else{
+					uni.showToast({
+					    title: '该设施已被绑定',
+					    icon: 'none',
+					    duration:2000
+					})
+				}
+			},
+			// 点击厕所是否绑定
+			btncesuo(index){
+				let deviceIds = this.cesuolist?.[0]?.equipmentList?.[index]?.deviceList?.[0]?.deviceId ?? null
+				let equipmentId = this.cesuolist[0].equipmentList[index].equipmentId
+				console.log(deviceIds,equipmentId,'厕所');
+				if(deviceIds == null){
+					let that = this
+					uni.showModal({
+						    title: '温馨提示',  
+						    content: '您确定要绑定到该设施上吗?',  
+						    success: function (res) {  
+						        if (res.confirm) {
+					                that.$u.post(`/app/device/placement/${equipmentId}/${that.deviceId}`).then(res => {
+										if(res.code == 200){
+											uni.showToast({
+											    title: '绑定成功',
+											    icon: 'success',
+											    duration:2000
+											})
+											that.getxq()
+										}else{
+											uni.showToast({
+											    title: res.msg,
+											    icon: 'none',
+											    duration:2000
+											})
+										}
+									})
+						        } else if (res.cancel) {
+						          
+						    }  
+						}  
+					})
+				}else{
+					uni.showToast({
+					    title: '该设施已被绑定',
+					    icon: 'none',
+					    duration:2000
+					})
+				}
+			},
+			
              // 获取门店详情
 			 getxq(){
 				this.$u.get(`app/store/mch/${this.storeId}`).then(res => {
 					if (res.code == 200) {
-						
+						this.objxq = res.data
+						this.roomList = []
+						this.cesuolist = []
+						this.datingobj = {}
+						res.data.roomList.forEach(item => {
+						    if (item.type2 == 1) {
+						        this.roomList.push(item)
+						    } else if (item.type2 == 2) {
+						        this.datingobj = item;
+						    } else if (item.type2 == 3) {
+						        this.cesuolist.push(item)
+						    }
+						})
+						console.log(this.roomList)
+						if(res.data.gateSn != null || res.data.gateSn != ''){
+							this.gateSnflag = true
+							this.$u.get(`/app/device/${res.data.gateSn}/bySn`).then(res => {
+								if(res.code == 200){
+									this.gateSnobj = res.data
+								}
+							})
+						}else{
+							this.gateSnflag = false
+						}
 					}
 				})
 			 }
@@ -168,6 +354,10 @@
 	/deep/ .u-title{
 		padding-bottom: 20rpx;
 	}
+	#active{
+		background-color: #DEF1DA !important;
+		color: #48893B !important;
+	}
 	page {
 		background: #F6F6F6;
 	}
@@ -187,7 +377,7 @@
 			flex-wrap: wrap;
 			justify-content: space-between;
 			margin-top: 16rpx;
-			width: 686rpx;
+			width: 100%;
 			max-height: 1408rpx;
 			background: #FFFFFF;
 			padding: 16rpx;
diff --git a/page_shanghu/dianpu.vue b/page_shanghu/dianpu.vue
index 53d0c4b..ebfaa27 100644
--- a/page_shanghu/dianpu.vue
+++ b/page_shanghu/dianpu.vue
@@ -24,10 +24,10 @@
 					<view style="color: #ccc;" class="rt" v-if="item.status == 0">
 						<text style="background-color: #ccc;"></text> 歇业中
 					</view>
-				</view>
+				</view> 
 				<view class="shouru">
 					<view class="one">
-						<view class="shang">
+						<view class="shang"> 
 							今日订单
 						</view>
 						<view class="xia">
diff --git a/page_shanghu/dianpuroomadd.vue b/page_shanghu/dianpuroomadd.vue
index e3415a4..b2b16ab 100644
--- a/page_shanghu/dianpuroomadd.vue
+++ b/page_shanghu/dianpuroomadd.vue
@@ -7,25 +7,25 @@
 			<view class="tongji">
 				<view class="one">
 					<view class="kg" v-if="gateSnflag == false">无</view>
-					<view class="kg" v-else>关</view>
+					<view class="kg" v-else> <text v-if="gateSnobj.powerStatus == 0">关</text> <text v-if="gateSnobj.powerStatus == 1">开</text> </view>
 					<view class="gn">店门</view>
 					<image src="https://api.ccttiot.com/smartmeter/img/static/uZNimi3DEsGWsjfJm2Bg" mode=""></image>
 				</view>
 				<view class="xian"></view>
 				<view class="one">
-					<view class="kg">空闲 <text>4</text> </view>
+					<view class="kg">空闲 <text>2</text> </view>
 					<view class="gn">房间</view>
 					<image src="https://api.ccttiot.com/smartmeter/img/static/uZNimi3DEsGWsjfJm2Bg" mode=""></image>
 				</view>
 				<view class="xian"></view>
 				<view class="one">
-					<view class="kg">空闲 <text>11</text> </view>
+					<view class="kg">空闲 <text>1</text> </view>
 					<view class="gn">大厅</view>
 					<image src="https://api.ccttiot.com/smartmeter/img/static/uZNimi3DEsGWsjfJm2Bg" mode=""></image>
 				</view>
 				<view class="xian"></view>
 				<view class="one">
-					<view class="kg" style="color: #FC902A;">暂无设置</view>
+					<view class="kg" style="color: #FC902A;">空闲 <text>2</text></view>
 					<view class="gn">卫生间</view>
 					<image src="https://api.ccttiot.com/smartmeter/img/static/uZNimi3DEsGWsjfJm2Bg" mode=""></image>
 				</view>
@@ -37,7 +37,7 @@
 				<view class="menbj">
 					<view class="top">
 						<view class="lt">
-							<text style="font-weight: 600;">店门</text> <text v-if="gateSnobj.onlineStatus == 0">设备离线</text>
+							<text style="font-weight: 600;">店门</text> <text v-if="gateSnobj.onlineStatus == 0" class="lixian">设备离线</text>
 						</view>
 						<view class="rt" v-if="gateSnobj.powerStatus == 0">
 							<text></text> 已关闭
@@ -57,65 +57,71 @@
 					</view>
 				</view>
 			</view>
-			<view class="damen" v-if="roomList != ''">
-				<view class="name">
-					房间
-				</view>
-				<view class="fjlist">
-				    <view class="fj_item" v-for="(item, index) in roomList" :key="item.id">
-				        <view class="name">
-				            <text>{{item.roomName}}</text>
-				            <text v-if="hasOfflineDevice(item.deviceList)" style="font-size: 28rpx;font-weight: 400;color: #969696;margin-top: 10rpx;">有设备离线</text>
-				        </view>
-				        <view class="zt" v-if="item.status == 1">
-				            <text>运营中</text>
-				        </view>
-				        <view style="color: #ccc;" class="zt" v-if="item.status == 0">
-				            <text style="background-color: #ccc; display: inline-block; width: 0; height: 0;"></text> 歇业中
-				        </view>
-				    </view>
+			<!-- 房间 --><!-- 房间 --><!-- 房间 --><!-- 房间 --><!-- 房间 --><!-- 房间 --><!-- 房间 --><!-- 房间 --><!-- 房间 -->
+			<view class="" v-if="roomList != ''">
+				<view class="damen" v-for="(item,index) in roomList" :key="index">
+					<view class="name">
+						{{item.storeName}}
+					</view>
+					<view class="fjlist">
+						<view class="fj_item" v-for="(val,index) in item.equipmentList" @click="btnroomxq" :key="index" :id="val.sn == null ? 'active' : ''">
+							<view class="name">
+								<text>{{val.name}}</text>
+								<text v-if="val.deviceList[0].onlineStatus == 0" style="font-size: 28rpx;font-weight: 400;color: #969696;margin-top: 10rpx;">设备离线</text>
+							</view>
+							<view class="zt" v-if="item.status == 1">
+							    <text>运营中</text>
+							</view>
+							<view style="color: #ccc;" class="zt" v-if="item.status == 0">
+							    <text style="background-color: #ccc; display: inline-block; width: 0; height: 0;"></text> 歇业中
+							</view>
+						</view>
+					</view>
 				</view>
 			</view>
-			<view class="damen" v-if="datingobj.deviceList">
+			<!-- 大厅 -->	<!-- 大厅 -->	<!-- 大厅 -->	<!-- 大厅 -->	<!-- 大厅 -->	<!-- 大厅 -->	<!-- 大厅 -->
+			<view class="damen" v-if="datingobj.equipmentList">
 				<view class="name">
 					大厅
 				</view>
-				<view class="menbj" v-for="(item,index) in datingobj.deviceList" :key="index">
+				<view class="menbj" v-for="(item,index) in datingobj.equipmentList" @click="btndating" :key="index">
 					<view class="top">
 						<view class="lt">
-							<text style="font-weight: 600;">{{datingobj.roomName}}</text> <text v-if="item.onlineStatus == 0">设备离线</text>
+							<text style="font-weight: 600;">{{item.name}}</text> <text v-if="item.deviceList[0].onlineStatus == 0" class="lixian">设备离线</text>
 						</view>
-						<view class="rt" v-if="item.powerStatus == 0">
+						<view class="rt" v-if="item.deviceList[0].powerStatus == 0">
 							<text></text> 已关闭
 						</view>
-						<view class="rt" style="color: #48893B;" v-if="item.powerStatus == 1">
+						<view class="rt" style="color: #48893B;" v-if="item.deviceList[0].powerStatus == 1">
 							<text style="background-color: #48893B;"></text> 已开启
 						</view>
 					</view>
 					<view class="bot">
 						<view class="lt">
-							SN：{{item.sn}}
+							SN：{{item.deviceList[0].sn}}
 						</view>
 						<view class="rt">
-							<image src="https://api.ccttiot.com/smartmeter/img/static/u4Btme5ARjeAyvvTjgBF" mode="" v-if="item.powerStatus == 0"></image>
-							<image src="https://api.ccttiot.com/smartmeter/img/static/ua6R9hsgQZTfahcpaA8G" mode="" v-if="item.powerStatus == 1"></image>
+							<image src="https://api.ccttiot.com/smartmeter/img/static/u4Btme5ARjeAyvvTjgBF" mode="" v-if="item.deviceList[0].powerStatus == 0"></image>
+							<image src="https://api.ccttiot.com/smartmeter/img/static/ua6R9hsgQZTfahcpaA8G" mode="" v-if="item.deviceList[0].powerStatus == 1"></image>
 						</view>
 					</view>
 				</view>
 			</view>
+			<!-- 房间 --> <!-- 房间 --><!-- 房间 --><!-- 房间 --><!-- 房间 --><!-- 房间 --><!-- 房间 --><!-- 房间 -->
 			<view class="damen" v-if="cesuolist != ''">
 				<view class="name">
 					卫生间配置
 				</view>
-				<view class="menbj" v-for="(item,index) in cesuolist" :key="index">
+				<view class="menbj" v-for="(item,index) in cesuolist[0].equipmentList" @click="btncesuo" :key="index">
 					<view class="top">
 						<view class="lt">
-							<text style="font-weight: 600;">{{item.roomName}}</text> <text v-if="hasOfflineDevice(item.deviceList)">设备离线</text>
+							<text style="font-weight: 600;">{{item.name}}</text> <text v-if="item.deviceList[0].onlineStatus == 0" class="lixian">设备离线</text>
+							<!-- v-if="hasOfflineDevice(item.deviceList)" -->
 						</view>
-						<view class="rt"  v-if="item.powerStatus == 0">
+						<view class="rt"  v-if="item.deviceList[0].powerStatus == 0">
 							<text></text> 已关闭
 						</view>
-						<view class="rt" style="color: #48893B;"  v-if="item.powerStatus == 1">
+						<view class="rt" style="color: #48893B;"  v-if="item.deviceList[0].powerStatus == 1">
 							<text style="background-color: #48893B;"></text> 已开启
 						</view>
 					</view>
@@ -124,8 +130,8 @@
 							无条件进入卫生间
 						</view>
 						<view class="rt">
-							<image src="https://api.ccttiot.com/smartmeter/img/static/u4Btme5ARjeAyvvTjgBF" mode=""  v-if="item.powerStatus == 0"></image>
-							<image src="https://api.ccttiot.com/smartmeter/img/static/ua6R9hsgQZTfahcpaA8G" mode=""  v-if="item.powerStatus == 1"></image>
+							<image src="https://api.ccttiot.com/smartmeter/img/static/u4Btme5ARjeAyvvTjgBF" mode=""  v-if="item.deviceList[0].powerStatus == 0"></image>
+							<image src="https://api.ccttiot.com/smartmeter/img/static/ua6R9hsgQZTfahcpaA8G" mode=""  v-if="item.deviceList[0].powerStatus == 1"></image>
 						</view>
 					</view>
 				</view>
@@ -155,8 +161,8 @@
 		</view>
          
 		<view class="anniu">
-			<view class="xinjian" @click="btnadd">
-				设置
+			<view class="xinjian" @click="btnedit">
+				编辑
 			</view>
 			<view class="queren" @click="btnroom">
 				门店配置
@@ -207,6 +213,50 @@
 			</view>
 		</view>
 		
+		<view class="mask" style="z-index: 3;" v-if="cesuoflag"></view>
+		<view class="addmen" v-if="cesuoflag">
+			<view class="top">
+				<view class="cha" @click="cesuoflag = false">
+					×
+				</view>
+				<view class="name">
+					请选择添加卫生间方式
+				</view>
+			</view>
+			<view class="one" @click="btntoufcesuo">
+				<view class="lt">
+					<view class="saoma">
+						扫码添加
+					</view>
+					<view class="saomas">
+						扫描设备上的二维码
+					</view>
+					<view class="saomas">
+						设置卫生间门
+					</view>
+				</view>
+				<view class="rt">
+					<image src="https://api.ccttiot.com/smartmeter/img/static/ukzEfdUUjPKUUOxonIgm" mode=""></image>
+				</view>
+			</view>
+			<view class="one" @click="btntoufcesuo">
+				<view class="lt">
+					<view class="saoma">
+						未投放设备列表添加
+					</view>
+					<view class="saomas">
+						选择列表中的设备
+					</view>
+					<view class="saomas">
+						设置卫生间门
+					</view>
+				</view>
+				<view class="rt">
+					<image src="https://api.ccttiot.com/smartmeter/img/static/ukzEfdUUjPKUUOxonIgm" mode=""></image>
+				</view>
+			</view>
+		</view>
+		
 	</view>
 </template>
 
@@ -227,7 +277,8 @@
 				xuanzeflag:false,
 				addmenflag:false,
 				gateSnobj:{},
-				gateSnflag:false
+				gateSnflag:false,
+				cesuoflag:false
 			}
 		},
 		onLoad(option) {
@@ -235,14 +286,38 @@
 			this.getxq()
 		},
 		methods: {
+			// 点击跳转编辑门店
+			btnedit(){
+				uni.navigateTo({
+					url:'/page_shanghu/editshop?storeId=' + this.storeId
+				})
+			},
+			// 点击大厅跳转到大厅详情
+			btncesuo(){
+				console.log(this.cesuolist[0].roomId);
+			},
+			// 点击大厅跳转到大厅详情
+			btndating(){
+				console.log(this.datingobj.roomId);
+			},
+			// 点击房间跳转到房间详情
+			btnroomxq(){
+				console.log(this.roomList[0].roomId);
+				uni.navigateTo({
+					url:'/page_shanghu/roomxq?roomId=' + this.roomList[0].roomId
+				})
+			},
+			
 			// 检查 deviceList 中是否至少有一个设备的 onlineStatus 为 0
 			hasOfflineDevice(deviceList) {
+				console.log(deviceList);
 				if(deviceList == !null){
 					return deviceList.some(device => device.onlineStatus == 0)
 				}
 			},
 			// 点击大门 房间等
 			btnshop(num){
+				this.xuanzeflag = false
 				if(num == 1){
 					this.addmenflag = true
 				}else if(num == 2){
@@ -253,8 +328,16 @@
 					uni.navigateTo({
 						url:'/page_moban/datingxq?storeId=' + this.storeId
 					})
+				}else if(num == 4){
+					this.cesuoflag = true
 				}
 			},
+			// 点击未投放厕所
+			btntoufcesuo(){
+				uni.navigateTo({
+					url:'/page_moban/toufcesuo'
+				})
+			},
 			// 点击选择未投放设备
 			btntouf(){
 				uni.navigateTo({
@@ -319,7 +402,8 @@
 						        this.cesuolist.push(item)
 						    }
 						})
-						if(res.data.gateSn != null || res.data.gateSn != ''){
+						console.log(this.roomList);
+						if(res.data.gateSn != null){
 							this.gateSnflag = true
 							this.$u.get(`/app/device/${res.data.gateSn}/bySn`).then(res => {
 								if(res.code == 200){
@@ -342,6 +426,9 @@
 	/deep/ .u-title{
 		padding-bottom: 20rpx;
 	}
+	.lixian{
+		color: #969696 !important;
+	}
 	.addmen{
 		width: 694rpx;
 		height: 702rpx;
@@ -543,9 +630,9 @@
 				display: flex;
 				justify-content: space-between;
 				.lt{
-					text{
+					text{ 
 						font-size: 28rpx;
-						color: #969696;
+						color: #3D3D3D;
 						margin-right: 54rpx;
 					}
 				}
diff --git a/page_shanghu/editshop.vue b/page_shanghu/editshop.vue
new file mode 100644
index 0000000..2e0e113
--- /dev/null
+++ b/page_shanghu/editshop.vue
@@ -0,0 +1,519 @@
+<template>
+	<view class="page">
+		<u-navbar title="编辑门店" :border-bottom="false" :background="bgc" back-icon-color="#262B37" title-color='#262B37'
+			title-size='36' height='40' id="navbar">
+		</u-navbar>
+        <view class="top">
+        	<view class="one">
+        		<view class="wz">门店名称</view> <view class=""><input type="text" v-model="name" placeholder="请输入门店名称"/> </view>
+        	</view>
+			<view class="one">
+				<view class="wz">门店类型</view> <view class="" @click="showlx = true">{{lxname}} <u-icon style="margin-left: 10rpx;" name="arrow-down" color="#808080" size="28"></u-icon> </view>
+			</view>
+			<view class="one">
+				<view class="wz">营业时间</view> 
+				<view class="but" style="display: flex;justify-content: space-between;">
+					<view class="" style="font-size: 28rpx;color: #666;" @click="btnyinye(1)">{{ksyy}}</view>
+					--
+					<view class="" style="font-size: 28rpx;color: #666;" @click="btnyinye(2)">{{jsyy}}</view>
+				</view>
+			</view>
+			<view class="one">
+				<view class="wz">联系人</view> <view class=""><input type="text" v-model="lianxi" placeholder="请输入联系人名称"/> </view>
+			</view>
+			<view class="one">
+				<view class="wz">联系电话</view> <view class=""><input type="text" v-model="tel" placeholder="请输入联系电话"/> </view>
+			</view>
+			<view class="one" style="margin-bottom: 0;">
+				<view class="wz">选择位置</view> <view class="" @click="btnweizhi">{{xqdz.length > 15 ? xqdz.slice(0,15) : xqdz}} <u-icon style="margin-left: 10rpx;" name="arrow-down" color="#808080" size="28"></u-icon> </view>
+			</view>
+        </view>
+        <u-picker mode="time" v-model="show" default-time="00:00" :params="params" @confirm="btnyy"></u-picker>
+		
+		<view class="biaoqian">
+			<view class="name">
+				标签设置
+			</view>
+			<view class="bqliat">
+			    <view 
+			        class="bqitem" 
+			        v-for="(item, index) in biaoqianlist" 
+			        :key="index" 
+			        @click="btnbq(item.dictValue,index)" 
+			        :class="{ 'active': isSelected(index) }">
+			        {{ item.dictLabel }}
+			    </view>
+			</view>
+		</view>
+		
+		<view class="mdpic">
+			<view class="tops">
+				门店照片
+			</view>
+			<view class="tishi">
+				门店环境、设备场景等，请选择横屏照片或拍照上传
+			</view>
+			<view class="pic" @click="getImage">
+				<image src="https://api.ccttiot.com/smartmeter/img/static/udXUCs8GULJZE9EZBLf1" class="img" mode=""></image>
+			</view>
+			<view class="pic" @click="getImage" v-for="(item,index) in imglist" :key="index">
+				<image :src="item" mode="aspectFill"></image>
+				<view class="delimg" @click.stop="btndlimg(index)">×</view>
+			</view>
+			<ksp-cropper mode="free" :width="352" :height="190" :maxWidth="1024" :maxHeight="1024" :url="url"
+				@cancel="oncancel" @ok="onok"></ksp-cropper>
+		</view>
+		<u-select v-model="showlx" :list="lxlist" @confirm="btnlx"></u-select>
+
+		<view class="anniu">
+			<view class="xinjian" @click="btnquxiao">
+				删除
+			</view>
+			<view class="queren" @click="btnadd">
+				修改
+			</view>
+		</view>
+        
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+                bgc: {
+                	backgroundColor: "#fff",
+                },
+				params: {
+					hour: true,
+					minute: true,
+				},
+				show: false,
+				ksyy: '开始营业时间',
+				jsyy: '结束营业时间',
+				imglist: [],
+				token: '',
+				userImgs: '',
+				url:'',
+				latitude:'',
+				longitude:'',
+				xqdz:'选择位置',
+				biaoqianlist:[],
+				bqindex:-1,
+				selectedIndices: [],
+				idlist:[],
+				name:'',
+				lianxi:'',
+				tel:'',
+				showlx:false,
+				lxlist:[
+					{
+						value: '2',
+						label: '棋牌'
+					},{
+						value: '1',
+						label: '茶室'
+					},{
+						value: '3',
+						label: '台球'
+					},
+				],
+				lxname:'请选择类型',
+				lxid:'',
+				storeId:''
+			}
+		},
+		onLoad(option) {
+            this.storeId = option.storeId
+			this.lianxi = ''
+			this.getxx()
+			this.getQiniuToken()
+			this.getbiaoqian()
+		},
+		onShow() {
+
+		},
+		methods: {
+			// 删除图片
+			btndlimg(index){
+				this.imglist.splice(index, 1)
+				console.log(this.imglist);
+			},
+			// 查询门店信息
+			getxx(){
+				this.$u.get(`app/store/${this.storeId}`).then(res => {
+					if(res.code == 200){
+						this.name = res.data.name
+						this.lianxi = res.data.contactName
+						this.tel = res.data.contactMobile
+						this.xqdz = res.data.address
+						this.longitude = res.data.lng
+						this.latitude = res.data.lat
+						this.ksyy = res.data.businessTimeStart
+						this.jsyy = res.data.businessTimeEnd
+						this.lxid = res.data.type
+						if(this.lxid == 1){
+							this.lxname = '茶室'
+						}else if(this.lxid == 2){
+							this.lxname = '棋牌'
+						}else if(this.lxid == 3){
+							this.lxname = '台球'
+						}
+						this.imglist = res.data.picture.split(",")
+						console.log(res.data.tags);
+						if(res.data.tags.length > 0){
+							this.selectedIndices = res.data.tags.map(item => {
+							    return item - 1
+							})
+						}
+						console.log(this.selectedIndices);
+					}
+				})
+			},
+			// 点击取消
+			btnquxiao(){
+				let that = this
+				uni.showModal({
+					    title: '温馨提示',  
+					    content: '您确定要删除该门店吗?',  
+					    success: function (res) {  
+					        if (res.confirm) {
+				                that.$u.delete(`app/store/${that.storeId}`).then(res =>{
+									if(res.code == 200){
+										uni.showToast({
+											title: '删除成功',
+											icon: 'success',
+											duration:2000
+										})
+										setTimeout(()=>{
+											uni.navigateBack({
+												delta:2
+											})
+										},1000)
+									}
+								})
+					        } else if (res.cancel) {
+					            uni.showToast({
+					            	title: res.msg,
+					            	icon: 'none',
+					            	duration:2000
+					            })
+					    }  
+					}  
+				})
+			},
+			// 确认修改门店
+			btnadd(){
+				let picture = this.imglist.join(",") //转成字符串
+               let arr = this.selectedIndices.map(item => {
+                   return item != null ? item + 1 : null 
+               })
+				let ss_store_tags = arr.filter(item => {
+                   return item !== null && !isNaN(item)
+               })
+			   console.log(ss_store_tags) 
+				let data = {
+					storeId:this.storeId,
+					name:this.name,
+					contactName:this.lianxi,
+					contactMobile:this.tel,
+					address:this.xqdz,
+					lng:this.longitude,
+					lat:this.latitude,
+					businessTimeStart:this.ksyy,
+					businessTimeEnd:this.jsyy,
+					picture:picture,
+					type:this.lxid,
+					tags:ss_store_tags
+				}
+				this.$u.put("/app/store",data).then((res) => {
+					if (res.code == 200) {
+						uni.showToast({
+							title: '修改成功',
+							icon: 'success',
+							duration:2000
+						})
+						setTimeout(()=>{
+							uni.navigateBack()
+						},1000)
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration:2000
+						})
+					}
+				})
+			},
+			// 点击确认类型
+			btnlx(e){
+				this.lxid = e[0].value
+				this.lxname=  e[0].label
+			},
+			// 点击选择标签
+			btnbq(dictValue,index) {
+			const indexExists = this.selectedIndices.includes(index);
+			    if (indexExists) {
+			        this.selectedIndices = this.selectedIndices.filter(i => i !== index);
+			    } else {
+			        this.selectedIndices.push(index);
+			    }
+			},
+			isSelected(index) {
+				console.log(index,this.selectedIndices);
+			    return this.selectedIndices.includes(index);
+			},
+			// 点击上传图片
+			getImage() {
+				if(this.imglist.length >= 5){
+					uni.showToast({
+						title: '最多上传五张图片',
+						icon: 'none'
+					})
+				}else{
+					uni.chooseImage({
+						count: 1,
+						success: (rst) => {
+							this.url = rst.tempFilePaths[0]
+							console.log(this.url);
+						}
+					})
+				}
+			},
+			onok(ev) {
+				this.url = ""
+				this.path = ev.path
+				let _this = this
+				let math = 'static/' + _this.$u.guid(20)
+				wx.uploadFile({
+					url: 'https://up-z2.qiniup.com',
+					name: 'file',
+					filePath: _this.path,
+					formData: {
+						token: _this.token, //后端返回的token
+						key: 'smartmeter/img/' + math
+					},
+					success: function(res) {
+						let str = JSON.parse(res.data)
+						_this.userImgs = 'https://lxnapi.ccttiot.com/' + str.key
+						_this.imglist.push(_this.userImgs)
+						console.log(_this.imglist);
+					}
+				})
+			},
+			oncancel() {
+			     // url设置为空，隐藏控件
+			     this.url = "";
+			},
+			// 点击选择位置
+			btnweizhi(){
+				uni.chooseLocation({
+					success: (res) => {
+						console.log(res);
+						this.latitude = res.latitude
+						this.longitude = res.longitude
+						this.xqdz = res.name
+					},
+					fail: function(err) {
+						if (err.errMsg && err.errMsg.indexOf('chooseLocation:cancel') === 0) {
+							uni.showToast({
+								title: '您取消了位置选择',
+								icon: 'none'
+							})
+						} else {
+							console.log('选择位置失败', err)
+						}
+					},
+				})
+			},
+			// 获取上传七牛云token
+			getQiniuToken() {
+				this.$u.get("/common/qiniu/uploadInfo").then((res) => {
+					if (res.code == 200) {
+						this.token = res.token
+					}
+				})
+			},
+			// 获取标签
+			getbiaoqian(){
+				this.$u.get(`/appVerify/getDictData?dictType=ss_store_tags`).then((res) => {
+					if (res.code == 200) {
+						this.biaoqianlist = res.data
+					}
+				})
+			},
+			// 选择营业时间
+			btnyinye(num) {
+				this.show = true
+				this.yynum = num
+			},
+			// 确定营业时间
+			btnyy(e) {
+				if (this.yynum == 1) {
+					this.ksyy = e.hour + ':' + e.minute
+				} else {
+					this.jsyy = e.hour + ':' + e.minute
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.active{
+		background-color: #48893B !important;
+		color: #fff !important;  
+	}
+	page {
+		background: #F6F6F6;
+		padding-bottom: 200rpx;
+		box-sizing: border-box;
+	}
+	/deep/ .panel{
+		position: fixed;
+		    width: 100%;
+		    height: 100%;
+		    top: 0;
+		    bottom: 0;
+		    left: 0;
+		    z-index: 99 !important;
+		    overflow: hidden;
+	}
+	.biaoqian{
+		width: 680rpx;
+		max-height: 624rpx;
+		background: #FFFFFF;
+		padding: 44rpx 34rpx;
+		box-sizing: border-box;
+		margin: auto;
+		margin-top: 22rpx;
+		border-radius: 20rpx;
+		.name{
+			font-weight: 600;
+			font-size: 36rpx;
+			color: #3D3D3D;
+		}
+		.bqliat{
+			margin-top: 30rpx;
+			display: flex;
+			flex-wrap: wrap;
+			.bqitem{
+				margin-right: 10rpx;
+				border: 1px solid #48893B;
+				color: #48893B;
+				padding: 10rpx;
+				margin-top: 10rpx;
+			}
+			image{
+				width: 226rpx;
+				height: 58rpx;
+			}
+		}
+	}
+	.anniu{
+		width: 750rpx;
+		height: 152rpx;
+		background: #FFFFFF;
+		box-shadow: 0rpx 8rpx 20rpx 0rpx rgba(0,0,0,0.3);
+		border-radius: 0rpx 0rpx 0rpx 0rpx;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		display: flex;
+		justify-content: space-between;
+		padding: 0 36rpx;
+		box-sizing: border-box;
+		padding-top: 24rpx;
+		.queren{
+			width: 330rpx;
+			height: 104rpx;
+			background: #48893B;
+			text-align: center;
+			line-height: 104rpx;
+			font-weight: 600;
+			font-size: 36rpx;
+			color: #FFFFFF;
+			border-radius: 20rpx;
+		}
+		.xinjian{
+			width: 330rpx;
+			height: 104rpx;
+			border: 2rpx solid #48893B;
+			border-radius: 20rpx;
+			text-align: center;
+			line-height: 104rpx;
+			font-weight: 600;
+			font-size: 36rpx;
+			color: #48893B;
+		}
+	}
+	.mdpic{
+		width: 680rpx;
+		max-height: 2500rpx;
+		background: #FFFFFF;
+		border-radius: 24rpx 24rpx 24rpx 24rpx;
+		margin: auto;
+		margin-top: 22rpx;
+		padding: 38rpx;
+		box-sizing: border-box;
+		.tops{
+			font-size: 32rpx;
+			color: #3D3D3D;
+		}
+		.tishi{
+			font-size: 24rpx;
+			color: #3D3D3D;
+			margin-top: 20rpx;
+		}
+		.pic{
+			margin-top: 36rpx;
+			position: relative;
+			.delimg{
+				width: 40rpx;
+				height: 40rpx;
+				background-color: red;
+				color: #fff;
+				text-align: center;
+				line-height: 40rpx;
+				border-radius: 50%;
+				font-size: 50rpx;
+				position: absolute;
+				top: -10rpx;
+				right: -10rpx;
+			}
+			.img{
+				width: 144rpx;
+				height: 144rpx;
+			}
+			image{
+				width: 610rpx;
+				height: 280rpx;
+			}
+		}
+	}
+    .top{
+		width: 680rpx;
+		max-height: 986rpx;
+		background: #FFFFFF;
+		border-radius: 24rpx 24rpx 24rpx 24rpx;
+		margin: auto;
+		margin-top: 22rpx;
+		padding: 50rpx 38rpx;
+		box-sizing: border-box;
+		.one{
+			display: flex;
+			justify-content: space-between;
+			margin-bottom: 34rpx;
+			align-items: center;
+			font-size: 28rpx;
+			color: #808080;
+			.wz{
+				color: #3D3D3D;
+			} 
+			input{
+				text-align: right;
+			}
+		}
+	}
+
+</style>
\ No newline at end of file
diff --git a/page_shanghu/erwm.vue b/page_shanghu/erwm.vue
new file mode 100644
index 0000000..bc57f7d
--- /dev/null
+++ b/page_shanghu/erwm.vue
@@ -0,0 +1,153 @@
+<template>
+	<view class="page">
+		<u-navbar title="二维码" :border-bottom="false" :background="bgc" back-icon-color="#262B37" title-color='#262B37'
+			title-size='36' height='50' id="navbar">
+		</u-navbar>
+		<view class="tishi">
+			<text>微信“扫一扫”使用小程序</text>
+			<text>开启您的一天好心情</text>
+		</view>
+        <view class="img">
+        	<!-- <image class="bj" src="https://api.ccttiot.com/smartmeter/img/static/uo2AtaJDlN9q2PxlBEDx" mode=""></image> -->
+			<!-- 展示二维码 -->
+			<view class="imgewm">
+				<canvas canvas-id="qrcode" style="height: 100%;margin: 0 auto;" />
+				<view class="" style="width: 100%;text-align: center;margin-top: 20rpx;">
+					SN:{{sn}}
+				</view>
+			</view>
+        </view>
+		<view class="anniu" @click="saveCanvas">
+			保存二维码
+		</view>
+	</view>
+</template>
+
+<script>
+	import uQRCode from '@/common/uqrcode.js'
+	export default {
+		data() {
+			return {
+                bgc: {
+                	backgroundColor: "#DEF1DA",
+                },
+				sn:''
+			}
+		},
+		onLoad(option) {
+			this.sn = option.sn
+           this.qrFun()
+		},
+		mounted() {
+			this.drawCanvas()
+		},
+		methods: {
+			drawCanvas() {
+				const ctx = uni.createCanvasContext('qrcode', this);
+				ctx.setFillStyle('#fff');
+				ctx.fillRect(10, 10, 250, 250);
+				ctx.draw();
+			},
+			// 保存二维码
+			saveCanvas() {
+				uni.canvasToTempFilePath({
+					canvasId: 'qrcode',
+					success: (res) => {
+						console.log(res.tempFilePath); // 打印图片路径  
+						uni.saveImageToPhotosAlbum({
+							filePath: res.tempFilePath,
+							success: function() {
+								uni.showToast({
+									title: '保存成功',
+									icon: 'success'
+								});
+							}
+						});
+					},
+					fail: (err) => {
+						console.error(err);
+					}
+				});
+			},
+			//**生成二维码**//
+			qrFun: function() {
+				this.wemflag = true
+				uQRCode.make({
+					canvasId: 'qrcode',
+					text: 'https://kg.chuantewulian.cn/w?s=' + this.sn,
+					size: 300,
+					margin: 0,
+					backgroundColor: '#ffffff',
+					foregroundColor: '#000000',
+					fileType: 'jpg',
+					errorCorrectLevel: uQRCode.errorCorrectLevel.H,
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	/deep/ .u-iconfont,
+	/deep/ .u-title{
+		padding-bottom: 20rpx;
+	}
+	.imgewm {
+		width: 700rpx;
+		height:700rpx;
+		margin: auto;
+		margin-top: 54rpx;
+		z-index: 2;
+	}
+	.tishi{
+		width: 620rpx;
+		height: 180rpx;
+		background: #F8FFF6;
+		border-radius: 20rpx 20rpx 20rpx 20rpx;
+		text-align: center;
+		padding-top: 20rpx;
+		box-sizing: border-box;
+		margin: auto;
+		margin-top: 54rpx;
+		text{
+			margin-top: 16rpx;
+			display: block;
+			font-size: 36rpx;
+			color: #3D3D3D;
+		}
+	}
+	page {
+		width: 750rpx;
+		height: 1624rpx;
+		background: #DEF1DA;
+		border-radius: 0rpx 0rpx 0rpx 0rpx;
+	}
+	.name{
+		width: 100%;
+		text-align: center;
+		font-size: 36rpx;
+	}
+	.img{
+		width: 666rpx;
+		height: 870rpx;
+		padding: 0 30rpx;
+		box-sizing: border-box;
+		margin-top: 30rpx;
+	}
+    .anniu{
+		width: 546rpx;
+		height: 88rpx;
+		background: #48893B;
+		border-radius: 59rpx 59rpx 59rpx 59rpx;
+		font-weight: 600;
+		font-size: 40rpx;
+		color: #FFFFFF;
+		text-align: center;
+		line-height: 88rpx;
+		position: fixed;
+		left: 50%;
+		transform: translateX(-50%);
+		bottom: 80rpx;
+	}
+
+</style>
\ No newline at end of file
diff --git a/page_shanghu/mendianadd.vue b/page_shanghu/mendianadd.vue
index 8e5df44..3c5d3cc 100644
--- a/page_shanghu/mendianadd.vue
+++ b/page_shanghu/mendianadd.vue
@@ -139,7 +139,8 @@
                 let arr = this.selectedIndices.map(item => {
                     return item + 1
                 })
-				let ss_store_tags = arr.join(',')
+				// console.log(arr);
+				let ss_store_tags = arr
 				let data = {
 					name:this.name,
 					contactName:this.lianxi,
@@ -151,7 +152,7 @@
 					businessTimeEnd:this.jsyy,
 					picture:picture,
 					type:this.lxid,
-					ss_store_tags:ss_store_tags
+					tags:ss_store_tags
 				}
 				this.$u.post("/app/store",data).then((res) => {
 					if (res.code == 200) {
diff --git a/page_shanghu/roomedit.vue b/page_shanghu/roomedit.vue
new file mode 100644
index 0000000..fd2ff88
--- /dev/null
+++ b/page_shanghu/roomedit.vue
@@ -0,0 +1,435 @@
+<template>
+	<view class="page">
+		<u-navbar title="编辑房间" :border-bottom="false" :background="bgc" back-icon-color="#262B37" title-color='#262B37'
+			title-size='36' height='40' id="navbar">
+		</u-navbar>
+       <view class="dalist">
+       	  <view class="box">
+       	  	<view class="name">
+       	  		<view class="lt">
+       	  			名称
+       	  		</view>
+       	  		<view class="rt">
+       	  			<input type="text" placeholder="请输入房间名称"/> <image src="https://api.ccttiot.com/smartmeter/img/static/uCta8cp7uXd1lGjZS6sc" mode=""></image>
+       	  		</view> 
+       	  	</view>
+       	  	<view class="name">
+       	  		<view class="lt">
+       	  			类型
+       	  		</view>
+       	  		<view class="rt" @click="show = true">
+       	  			{{leixing}}  <image src="https://api.ccttiot.com/smartmeter/img/static/uCta8cp7uXd1lGjZS6sc" mode=""></image>
+       	  		</view> 
+       	  	</view>
+       	  	<view class="name" style="border: none;">
+       	  		<view class="lt">
+       	  			是否开启保洁功能
+       	  		</view>
+       	  		<view class="rt">
+       	  			<u-switch size="32" v-model="checked" active-color="#48893B" inactive-color="#eee"></u-switch>
+       	  		</view> 
+       	  	</view>
+       	  </view>
+       	  <view class="biaoqian">
+       	  	<view class="name">
+       	  		标签设置
+       	  	</view>
+       	  	<view class="bqliat">
+       	  	    <view 
+       	  	        class="bqitem" 
+       	  	        v-for="(item, index) in biaoqianlist" 
+       	  	        :key="index" 
+       	  	        @click="btnbq(item.dictValue,index)" 
+       	  	        :class="{ 'active': isSelected(index) }">
+       	  	        {{ item.dictLabel }}
+       	  	    </view>
+       	  	</view>
+       	  </view>
+       	  <view class="biaoqian">
+       	  	<view class="name">
+       	  		房间照片
+       	  	</view>
+       	  	<image v-if="imgurl == ''" @click="getImage" src="https://api.ccttiot.com/smartmeter/img/static/uRBDOOtzMZgSbCcXQPGH" mode=""></image>
+       	  	<image v-else :src="imgurl" mode=""></image>
+       	  	<ksp-cropper mode="free" :width="150" :height="150" :maxWidth="1024" :maxHeight="1024" :url="url"
+       	  		@cancel="oncancel" @ok="onok"></ksp-cropper>
+       	  </view>
+       	  
+       	  <view class="biaoqian">
+       	  	<view class="name">
+       	  		价格设置
+       	  	</view>
+       	  	<view class="shoufei" @click="btnshoufei">
+       	  		<view class="shang">
+       	  			<view class="">
+       	  				收费方式
+       	  			</view>
+       	  			<view class="">
+       	  				<text>套餐1 </text> <image src="https://api.ccttiot.com/smartmeter/img/static/u0rIwef50qNN4aaeqSfl" mode=""></image>
+       	  			</view>
+       	  		</view>
+       	  		<view class="shichang">
+       	  			<view class="stop">
+       	  				<view class="">
+       	  					套餐时长
+       	  				</view>
+       	  				<view class="">
+       	  					套餐价格(元)
+       	  				</view>
+       	  			</view>
+       	  			<view class="stop" v-for="(item,index) in 4" :key="index" style="background-color: #F9F9F9;">
+       	  				<view class="">
+       	  					3小时
+       	  				</view>
+       	  				<view class="">
+       	  					99.9
+       	  				</view>
+       	  			</view>
+       	  		</view>
+				<view class="wz">
+					注：订单提前结束剩余消费时长、金额不返还
+				</view>
+       	  	</view>
+<!-- 			<view class="shoufei" @click="btnguize">
+				<view class="shang">
+					<view class="">
+						取消规则
+					</view>
+					<view class="">
+						<text>取消规则1 </text> <image src="https://api.ccttiot.com/smartmeter/img/static/u0rIwef50qNN4aaeqSfl" mode=""></image>
+					</view>
+				</view>
+				<view class="shichang">
+					<view class="stop">
+						<view class="">
+							取消时长
+						</view>
+						<view class="">
+							违约金
+						</view>
+						<view class="">
+							说明
+						</view>
+					</view>
+					<view class="stop" v-for="(item,index) in 4" :key="index" style="background-color: #F9F9F9;">
+						<view class="">
+							开始前30分钟外
+						</view>
+						<view class="">
+							不收取
+						</view>
+						<view class="">
+						     无
+						</view>
+					</view>
+				</view>
+			</view> -->
+       	  </view>
+       	  
+       	  
+       	  <u-select v-model="show" :list="list" @confirm="confirm"></u-select>
+       	  <view class="anniu">
+       	  	<view class="xinjian" @click="btndt">
+       	  		取消
+       	  	</view>
+       	  	<view class="queren" @click="btnmd">
+       	  		确认新建
+       	  	</view>
+       	  </view>
+       </view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+                bgc: {
+                	backgroundColor: "#fff",
+                },
+				leixing:'请选择类型',
+				show:false,
+				checked:false,
+				list:[
+					{
+						value: '2',
+						label: '棋牌'
+					},
+					{
+						value: '1',
+						label: '茶室'
+					},
+					{
+						value: '3',
+						label: '台球'
+					},
+				],
+				type:'',
+				biaoqianlist:[],
+				selectedIndices:[],
+				token:'',
+				url:'',
+				imgurl:''
+				
+			}
+		},
+		onLoad() {
+            
+		},
+		onShow() {
+			this.getbiaoqian()
+			this.getQiniuToken()
+		},
+		methods: {
+			// 点击选择收费
+			btnshoufei(){
+				uni.navigateTo({
+					url:'/page_moban/shoufei'
+				})
+			},
+			// 点击选择标签
+			btnbq(dictValue,index) {
+			const indexExists = this.selectedIndices.includes(index);
+			    if (indexExists) {
+			        this.selectedIndices = this.selectedIndices.filter(i => i !== index);
+			    } else {
+			        this.selectedIndices.push(index);
+			    }
+			},
+			isSelected(index) {
+			    return this.selectedIndices.includes(index);
+			},
+			// 获取标签
+			getbiaoqian(){
+				this.$u.get(`/appVerify/getDictData?dictType=ss_room_tags`).then((res) => {
+					if (res.code == 200) {
+						this.biaoqianlist = res.data
+					}
+				})
+			},
+			// 点击上传图片
+			getImage() {
+				uni.chooseImage({
+					count: 1,
+					success: (rst) => {
+						this.url = rst.tempFilePaths[0]
+						console.log(this.url);
+					}
+				})
+			},
+			onok(ev) {
+				this.url = ""
+				this.path = ev.path
+				let _this = this
+				let math = 'static/' + _this.$u.guid(20)
+				wx.uploadFile({
+					url: 'https://up-z2.qiniup.com',
+					name: 'file',
+					filePath: _this.path,
+					formData: {
+						token: _this.token, //后端返回的token
+						key: 'smartmeter/img/' + math
+					},
+					success: function(res) {
+						let str = JSON.parse(res.data)
+						_this.imgurl = 'https://lxnapi.ccttiot.com/' + str.key
+					}
+				})
+			},
+			oncancel() {
+			     // url设置为空，隐藏控件
+			     this.url = "";
+			},
+			// 获取上传七牛云token
+			getQiniuToken() {
+				this.$u.get("/common/qiniu/uploadInfo").then((res) => {
+					if (res.code == 200) {
+						this.token = res.token
+					}
+				})
+			},
+			// 确认选择类型
+			confirm(e){
+				this.type = e[0].value
+				this.leixing =e[0].label
+			},
+			// 点击确定新建房间
+			btnmd(){
+				
+			},
+			// 点击取消
+			btndt(){
+				uni.navigateBack()
+			}
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	.active{
+		background-color: #48893B !important;
+		color: #fff !important;  
+	}
+	page {
+		background: #F6F6F6;
+	}
+	.dalist{
+		width: 100%;
+		height: 80vh;
+		overflow: scroll;
+		padding-bottom: 40rpx;
+		box-sizing: border-box;
+	}
+	.biaoqian{
+		width: 680rpx;
+		max-height: 1624rpx;
+		background: #FFFFFF;
+		padding: 44rpx 34rpx;
+		box-sizing: border-box;
+		margin: auto;
+		margin-top: 22rpx;
+		border-radius: 20rpx;
+		.shoufei{
+			margin-top: 30rpx;
+			.wz{
+				font-size: 24rpx;
+				color: #3D3D3D;
+				margin-top: 24rpx;
+				margin-bottom: 20rpx;
+			}
+			.shichang{
+				margin-top: 34rpx;
+				.stop{
+					display: flex;
+					width: 618rpx;
+					height: 76rpx;
+					line-height: 76rpx;
+					background: #F0F0F0;
+					view{
+						width: 50%;
+						text-align: center;
+						font-size: 28rpx;
+						color: #3D3D3D;
+					}
+				}
+			}
+			.shang{
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				width: 100%;
+				view{
+					font-size: 32rpx;
+					color: #3D3D3D;
+					display: flex;
+					align-items: center;
+					image{
+						width: 14rpx;
+						height: 42rpx;
+						margin-top: 0;
+						margin-right: 10rpx;
+					}
+				}
+			}
+		}
+		image{
+			width: 144rpx;
+			height: 144rpx;
+			margin-top: 30rpx;
+		}
+		.name{
+			font-weight: 600;
+			font-size: 36rpx;
+			color: #3D3D3D;
+		}
+		.bqliat{
+			margin-top: 30rpx;
+			display: flex;
+			flex-wrap: wrap;
+			.bqitem{
+				margin-right: 10rpx;
+				border: 1px solid #48893B;
+				color: #48893B;
+				padding: 10rpx;
+				margin-top: 10rpx;
+			}
+			image{
+				width: 226rpx;
+				height: 58rpx;
+			}
+		}
+	}
+	.anniu{
+		width: 750rpx;
+		height: 152rpx;
+		background: #FFFFFF;
+		box-shadow: 0rpx 8rpx 20rpx 0rpx rgba(0,0,0,0.3);
+		border-radius: 0rpx 0rpx 0rpx 0rpx;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		display: flex;
+		justify-content: space-between;
+		padding: 0 36rpx;
+		box-sizing: border-box;
+		padding-top: 24rpx;
+		.queren{
+			width: 314rpx;
+			height: 104rpx;
+			background: #48893B;
+			text-align: center;
+			line-height: 104rpx;
+			font-weight: 600;
+			font-size: 36rpx;
+			color: #FFFFFF;
+			border-radius: 20rpx;
+		}
+		.xinjian{
+			width: 314rpx;
+			height: 104rpx;
+			border: 2rpx solid #48893B;
+			border-radius: 20rpx;
+			text-align: center;
+			line-height: 104rpx;
+			font-weight: 600;
+			font-size: 36rpx;
+			color: #48893B;
+		}
+	}
+	.box{
+		width: 680rpx;
+		max-height: 408rpx;
+		background: #FFFFFF;
+		margin: auto;
+		margin-top: 22rpx;
+		border-radius: 20rpx;
+		.name{
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			width: 618rpx;
+			margin: auto;
+			height: 110rpx;
+			border-bottom: 1px solid #D8D8D8;
+			.lt{
+				font-size: 32rpx;
+				color: #3D3D3D;
+			}
+			.rt{
+				display: flex;
+				align-items: center;
+				input{
+					text-align: right;
+				}
+				image{
+					width: 14rpx;
+					height: 42rpx;
+					margin-left: 10rpx;
+				}
+			}
+		}
+	}
+
+
+</style>
\ No newline at end of file
diff --git a/page_shanghu/roomxq.vue b/page_shanghu/roomxq.vue
new file mode 100644
index 0000000..8424b31
--- /dev/null
+++ b/page_shanghu/roomxq.vue
@@ -0,0 +1,556 @@
+<template>
+	<view class="page">
+		<u-navbar title="房间详情" :border-bottom="false" :background="bgc" back-icon-color="#262B37" title-color='#262B37'
+			title-size='36' height='50' id="navbar">
+		</u-navbar>
+        <view class="boxtop">
+        	<view class="top">
+        		<view class="name">
+        			房间1
+        		</view>
+				<view class="yuny">
+					<text></text> 运营中
+				</view>
+        	</view>
+			<view class="bot">
+				<view class="" @click="btnjfgz">
+					<image src="https://api.ccttiot.com/smartmeter/img/static/udeYbjiOdwddMbUM90QB" mode=""></image> 计费规则
+				</view>
+				<view class="" @click="btnewm">
+					<image src="https://api.ccttiot.com/smartmeter/img/static/uT7NCRBVoRy8KFIF9Gtq" mode=""></image> 下载二维码
+				</view>
+				<view class="" @click="btnroomsz">
+					<image src="https://api.ccttiot.com/smartmeter/img/static/uTBNF3xzr0EAJjzJ3Ggc"mode=""></image> 房间设置
+				</view>
+			</view>
+        </view>
+		<view class="tops">
+			<view class="lt">
+				设施列表
+			</view>
+			<view class="rt" @click="flag = !flag">
+				添加
+			</view>
+			<view class="tianjia" v-if="flag">
+				<view class="" @click="btnaddfm(1)">
+					添加房门
+				</view>
+				<view class="" @click="btnaddfm(2)">
+					添加电源
+				</view>
+				<view class="" @click="btnaddfm(3)" style="border: none;">
+					添加设施
+				</view>
+			</view>
+		</view>
+		<view class="list">
+			<view class="item_list">
+				<view class="lt">
+					<view class="name">
+						房间门   <text>设备离线</text>
+					</view>
+					<view class="sn">
+						SN：2234681537
+					</view>
+				</view>
+				<view class="rt">
+					<view class="name">
+						<text></text> 已关闭
+					</view>
+					<view class="img">
+						<image src="https://api.ccttiot.com/smartmeter/img/static/uvqVahRyvBHooSDLQfED" mode=""></image>
+					</view>
+				</view>
+			</view>
+			<view class="item_list" @click="btnwbd">
+				<view class="lt">
+					<view class="name">
+						房间灯  <text>设备离线</text>
+					</view>
+			
+				</view>
+				<view class="rt">
+					<view class="name">
+						<text></text> 未绑定
+					</view>
+					
+				</view>
+			</view>
+		</view>
+		<!-- 添加房门 -->
+		<view class="mask" v-if="fmflag"></view>
+		<view class="addmen" v-if="fmflag">
+			<view class="top">
+				<view class="cha" @click="fmflag = false">
+					×
+				</view>
+				<view class="name">
+					请选择添加{{roomtxt}}方式
+				</view>
+			</view>
+			<view class="one" @click="btntoufcesuo">
+				<view class="lt">
+					<view class="saoma">
+						扫码添加
+					</view>
+					<view class="saomas">
+						扫描设备上的二维码
+					</view>
+					<view class="saomas">
+						设置{{roomtxt}}
+					</view>
+				</view>
+				<view class="rt">
+					<image src="https://api.ccttiot.com/smartmeter/img/static/ukzEfdUUjPKUUOxonIgm" mode=""></image>
+				</view>
+			</view>
+			<view class="one" @click="btntouffm">
+				<view class="lt">
+					<view class="saoma">
+						未投放设备列表添加
+					</view>
+					<view class="saomas">
+						选择列表中的设备
+					</view>
+					<view class="saomas">
+						设置{{roomtxt}}
+					</view>
+				</view>
+				<view class="rt">
+					<image src="https://api.ccttiot.com/smartmeter/img/static/ukzEfdUUjPKUUOxonIgm" mode=""></image>
+				</view>
+			</view>
+		</view>
+        <view class="mask" v-if="pricegzflag"></view>
+		<view class="pricegz" v-if="pricegzflag">
+			<view class="top">
+				下单须知：
+			</view>
+			<view class="shuom">
+				基础单价每1小时10元，最低消费时长2小 时，押金金额100元（订单结束30分钟内退 还）注：订单提前结束剩余消费时长、金额 不返还
+			</view>
+			<view class="annius" @click="pricegzflag = false">
+				确认
+			</view>
+		</view>
+		
+		<view class="anniu">
+			<view class="xinjian" @click="btndt">
+				下线维护
+			</view>
+			<view class="xinjian" @click="btndt">
+				全开
+			</view>
+			<view class="xinjian" @click="btndt">
+				全关
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+                bgc: {
+                	backgroundColor: "#fff",
+                },
+				roomId:'',
+				flag:false,
+				fmflag:false,
+				roomtxt:'',
+				pricegzflag:false
+			}
+		},
+		onLoad(option) {
+            this.roomId = option.roomId
+			this.getxq()
+		},
+		methods: {
+			// 点击弹出计费规则
+			btnjfgz(){
+				this.pricegzflag = true
+			},
+			// 跳转到编辑房间页
+			btnroomsz(){
+				uni.navigateTo({
+					url:'/page_shanghu/roomedit'
+				})
+			},
+			// 跳转到保存二维码
+			btnewm(){
+				uni.navigateTo({
+					url:'/page_shanghu/erwm'
+				})
+			},
+			// 点击进行扫码
+			btntoufcesuo(){
+				this.fmflag = false
+				uni.scanCode({
+					onlyFromCamera: true,
+					scanType: ['qrCode'],
+					success: res => {
+						function getQueryParam(url, paramName) {
+							let regex = new RegExp(`[?&]${paramName}=([^&]*)`)
+							let results = regex.exec(url);
+							return results ? decodeURIComponent(results[1].replace(/\+/g, ' ')) : null
+						}
+						console.log(res);
+						let sceneValue = res.result
+						let decodedValue = decodeURIComponent(sceneValue)
+						let id = getQueryParam(decodedValue, 'sn')
+						let that = this
+						let data = {
+							sn: id,
+							storeId:this.storeId
+						}
+                        uni.navigateTo({
+                        	url:'/page_shanghu/weishebei'
+                        })
+					}
+				})
+			},
+			// 点击未投放列表选择设备
+			btntouffm(){
+				this.fmflag = false
+				uni.navigateTo({
+					url:'/page_shanghu/weishebei'
+				})
+			},
+			// 点击添加房门
+			btnaddfm(num){
+				if(num == 1){
+					this.roomtxt = '房门'
+					this.fmflag = true
+					this.flag = false
+				}else if(num == 2){
+					this.roomtxt = '电源'
+					this.fmflag = true
+					this.flag = false
+				}else if(num == 3){
+					this.roomtxt = '设施'
+					this.fmflag = true
+					this.flag = false
+				}
+			},
+			// 请求房间详情
+			getxq(){
+				this.$u.get(`/app/room/${this.roomId}`).then(res =>{
+					if(res.code == 200){
+						
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	/deep/ .u-iconfont,
+	/deep/ .u-title{
+		padding-bottom: 20rpx;
+	}
+	.pricegz{
+		width: 636rpx;
+		max-height: 438rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx 20rpx 20rpx 20rpx;
+		padding: 52rpx 46rpx;
+		box-sizing: border-box;
+		margin: auto;
+		position: fixed;
+		top: 490rpx;
+		left: 50%;
+		transform: translateX(-50%);
+		z-index: 3;
+		.top{
+			font-weight: 600;
+			font-size: 32rpx;
+			color: #3D3D3D;
+		}
+		.shuom{
+			font-size: 28rpx;
+			color: #3D3D3D;
+			margin-top: 24rpx;
+		}
+		.annius{
+			width: 542rpx;
+			height: 86rpx;
+			background: #48893B;
+			border-radius: 14rpx 14rpx 14rpx 14rpx;
+			text-align: center;
+			line-height: 86rpx;
+			font-weight: 600;
+			font-size: 36rpx;
+			color: #FFFFFF;
+			margin-top: 30rpx;
+		}
+	}
+	.mask{
+		width: 100%;
+		height: 100vh;
+		background-color: #000;
+		opacity: .3;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 3;
+	}
+	.addmen{
+		width: 694rpx;
+		height: 702rpx;
+		background: linear-gradient( 180deg, #DEF1DA 0%, #FFFFFF 100%, #FFFFFF 100%);
+		border-radius: 36rpx 36rpx 36rpx 36rpx;
+		position: fixed;
+		top: 464rpx;
+		left: 50%;
+		transform: translateX(-50%);
+		z-index: 3;
+		box-shadow: 1px 2px 4px -3px;
+		.one{
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			width: 100%;
+			.rt{
+				image{
+					width: 60rpx;
+					height: 60rpx;
+				}
+			}
+			.saoma{
+				font-weight: 600;
+				font-size: 36rpx;
+				color: #48893B;
+				margin-top: 10rpx;
+			}
+			.saomas{
+	            font-size: 28rpx;
+	            color: #48893B;		
+				margin-top: 10rpx;
+			}
+			width: 584rpx;
+			height: 224rpx;
+			border: 2rpx solid #48893B;
+			border-radius: 20rpx;
+			margin: auto;
+			margin-top: 48rpx;
+			padding: 38rpx 44rpx;
+			box-sizing: border-box;
+		}
+		.top{
+			display: flex;
+			flex-wrap: wrap;
+			padding: 0 26rpx;
+			box-sizing: border-box;
+			.name{
+				font-weight: 600;
+				font-size: 44rpx;
+				color: #48893B;
+				width: 100%;
+				text-align: center;
+				position: absolute;
+				top: 56rpx;
+				left: 50%;
+				transform: translateX(-50%);
+			}
+			.cha{
+				font-size: 68rpx;
+				font-weight: 600;
+				width: 100%;
+				text-align: right;
+			}
+		}
+	}
+	.anniu{
+		width: 750rpx;
+		height: 152rpx;
+		background: #FFFFFF;
+		box-shadow: 0rpx 8rpx 20rpx 0rpx rgba(0,0,0,0.3);
+		border-radius: 0rpx 0rpx 0rpx 0rpx;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		display: flex;
+		justify-content: space-between;
+		padding: 0 36rpx;
+		box-sizing: border-box;
+		padding-top: 24rpx;
+		.xinjian{
+			width: 214rpx;
+			height: 104rpx;
+			border: 2rpx solid #48893B;
+			border-radius: 20rpx;
+			text-align: center;
+			line-height: 104rpx;
+			font-weight: 600;
+			font-size: 36rpx;
+			color: #48893B;
+		}
+	}
+	page {
+		background: #F6F6F6;
+	}
+	.list{
+		padding: 0 32rpx;
+		box-sizing: border-box;
+		margin-top: 42rpx;
+		.item_list{
+			display: flex;
+			justify-content: space-between;
+			margin-top: 18rpx;
+			max-height: 184rpx;
+			.rt{
+				.name{
+					display: flex;
+					align-items: center;
+					text{
+						width: 10rpx;
+						height: 10rpx;
+						background: #7C7C7C;
+						border-radius: 50%;
+						margin-right: 10rpx;
+						font-size: 28rpx;
+						color: #969696;
+					}
+				}
+				.img{
+					text-align: right;
+					margin-top: 20rpx;
+					image{
+						width: 50rpx;
+						height: 50rpx;
+					}
+				}
+			}
+			.lt{
+				.name{
+					font-weight: 600;
+					font-size: 32rpx;
+					color: #3D3D3D;
+					text{
+						font-size: 28rpx;
+						color: #969696;
+						font-weight: 400;
+						margin-left: 30rpx;
+					}
+				}
+				.sn{
+					font-size: 26rpx;
+					color: #3D3D3D;
+					margin-top: 26rpx;
+				}
+			}
+			padding: 32rpx 30rpx;
+			box-sizing: border-box;
+			width: 680rpx;
+			background: #FFFFFF;
+			border-radius: 20rpx 20rpx 20rpx 20rpx;
+		}
+	}
+	.boxtop{
+		width: 680rpx;
+		height: 244rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx 20rpx 20rpx 20rpx;
+		margin: auto;
+		margin-top: 22rpx;
+		padding: 34rpx 30rpx;
+		box-sizing: border-box;
+		.bot{
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-top: 40rpx;
+			view{
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 204rpx;
+				height: 54rpx;
+				border-radius: 27rpx 27rpx 27rpx 27rpx;
+				border: 1rpx solid #7C7C7C;
+				image{
+					width: 32rpx;
+					height: 32rpx;
+					margin-right: 6rpx;
+				}
+			}
+		}
+		.name{
+			font-weight: 600;
+			font-size: 30rpx;
+			color: #3D3D3D;
+		}
+		.yuny{
+			display: flex;
+			align-items: center;
+			font-weight: 600;
+			font-size: 28rpx;
+			color: #48893B;
+			text{
+				width: 10rpx;
+				height: 10rpx;
+				background: #48893B;
+				border-radius: 50%;
+				margin-right: 10rpx;
+			}
+		}
+		.top{
+			display: flex;
+			justify-content: space-between;
+			border-bottom: 1px solid #D8D8D8;
+			padding-bottom: 22rpx;
+			box-sizing: border-box;
+		}
+	}
+	.tops{
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 0 36rpx;
+		box-sizing: border-box;
+		margin-top: 70rpx;
+		position: relative;
+		.tianjia{
+			width: 170rpx;
+			height: 214rpx;
+			background: #FFFFFF;
+			box-shadow: 0rpx 0rpx 6rpx 0rpx rgba(0,0,0,0.3);
+			border-radius: 12rpx 12rpx 12rpx 12rpx;
+			position: absolute;
+			top: 80rpx;
+			right: 36rpx;
+			view{
+				width: 120rpx;
+				height: 70rpx;
+				line-height: 70rpx;
+				text-align: center;
+				margin: auto;
+				border-bottom: 1px solid #D8D8D8;
+				font-size: 28rpx;
+				color: #3D3D3D;
+			}
+		}
+		.lt{
+			font-weight: 600;
+			font-size: 36rpx;
+			color: #3D3D3D;
+		}
+		.rt{
+			width: 126rpx;
+			height: 58rpx;
+			background: #48893B;
+			border-radius: 6rpx 6rpx 6rpx 6rpx;
+			font-weight: 600;
+			text-align: center;
+			line-height: 58rpx;
+			font-size: 28rpx;
+			color: #FFFFFF;
+		}
+	}
+
+ 
+</style>
\ No newline at end of file
diff --git a/page_shanghu/shebei.vue b/page_shanghu/shebei.vue
index 93a272f..1aec7a4 100644
--- a/page_shanghu/shebei.vue
+++ b/page_shanghu/shebei.vue
@@ -53,7 +53,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="sbm">
+				<view class="sbm" @click.stop="btnewm(item.sn)">
 					<text></text>
 					<view class="">
 						设备码
@@ -147,6 +147,12 @@
 			   	url:'/page_shanghu/index'
 			   })
 			},
+			// 点击跳转到二维码
+			btnewm(sn){
+				uni.navigateTo({
+					url:'/page_shanghu/erwm?sn=' + sn
+				})
+			},
 			// 点击进行搜索
 			btnsousuo(){
 				this.pagesum = 1
@@ -314,7 +320,7 @@
 					border-radius: 14rpx 14rpx 14rpx 14rpx;
 					border: 2rpx solid #48893B;
 					text-align: center;
-					line-height: 62rpx;
+					line-height: 64rpx;
 					font-size: 32rpx;
 					color: #48893B;
 				}
diff --git a/page_shanghu/shebeixq.vue b/page_shanghu/shebeixq.vue
index d3f854d..fe2a45f 100644
--- a/page_shanghu/shebeixq.vue
+++ b/page_shanghu/shebeixq.vue
@@ -3,8 +3,8 @@
 		<u-navbar title="设备信息" :border-bottom="false" :background="bgc" back-icon-color="#262B37" title-color='#262B37'
 			title-size='36' height='48' id="navbar">
 		</u-navbar>
-        <view class="box" v-if="xianshiflag">
-        	<view class="ulbox">
+        <view class="box" v-if="xxobj.placementStatus == 2">
+        	<view class="ulbox" @click="editnameflag = true">
         		<view class="one">
         			设备名称
         		</view>
@@ -66,25 +66,25 @@
         </view>
 		
 		<!-- 已投放  已投放  已投放 -->
-		<view class="" v-else>
+		<view class="" v-if="xxobj.placementStatus == 1">
 			<view class="toufangbox">
 				<view class="shebeibj">
 					<view class="lt">
-						<view class="name">
-							竹韵包厢
+						<view class="name" @click="editnameflag = true">
+							{{xxobj.deviceName}} <u-icon name="edit-pen-fill" color="#3f3f3f" size="38"></u-icon>
 						</view>
 						<view class="zt">
-							设备状态：<text>已投放</text>
+							设备状态：<text v-if="xxobj.placementStatus == 1">已投放</text><text v-if="xxobj.placementStatus == 2">未投放</text>
 						</view>
 						<view class="zt">
-							SN：32562365B
+							SN：{{xxobj.sn}}
 						</view>
 						<view class="zt">
-							更新时间：2024-09-29 10:23:59
+							更新时间：{{xxobj.updateTime}}
 						</view>
 					</view>
 					<view class="rt">
-					    <image src="https://api.ccttiot.com/smartmeter/img/static/u1sz4KYjWV94zY1AbFSv" mode=""></image>	
+					    <image :src="xxobj.picture" mode=""></image>	
 					</view>
 				</view>
 			</view>
@@ -97,7 +97,7 @@
 						设备名称
 					</view>
 					<view class="thr">
-						一号桌
+						{{xxobj.deviceName}}
 					</view>
 				</view>
 				<view class="one">
@@ -105,23 +105,26 @@
 						店铺名称
 					</view>
 					<view class="thr">
-						福鼎-西湖店
+						{{mdianobj.name == null ? '--' : mdianobj.name}}
 					</view>
 				</view>
 				<view class="one">
 					<view class="two">
 						详细地址
 					</view>
-					<view class="thr">
-						福建省宁德市福鼎市太姥山镇
+					<view class="thr" v-if="mdianobj.address">
+						{{mdianobj.address.length > 15 ? mdianobj.address.slice(0,15) + '...' : mdianobj.address}}
+					</view>
+					<view class="thr" v-else>
+						--
 					</view>
 				</view>
 				<view class="one">
 					<view class="two">
-						投放时间
+						绑定时间
 					</view>
 					<view class="thr">
-						2024-11-30 13:45:22
+						{{xxobj.activationTime == null ? '--' : xxobj.activationTime}}
 					</view>
 				</view>
 			</view>
@@ -130,7 +133,7 @@
 					联网状态
 				</view>
 				<view class="thr">
-					在线 <image src="https://api.ccttiot.com/smartmeter/img/static/uS5JydUQDmvbMyg4nsdo" mode=""></image>
+					{{xxobj.onlineStatus == 0 ? '离线' : '在线'}} <image src="https://api.ccttiot.com/smartmeter/img/static/uS5JydUQDmvbMyg4nsdo" mode=""></image>
 				</view>
 			</view>
 			<view class="jieb" @click="btnjiebang">
@@ -139,6 +142,22 @@
 				</view>
 			</view>
 		</view>
+		
+		<view class="mask" v-if="editnameflag"></view>
+		<view class="editname" v-if="editnameflag">
+			<view class="top">
+				修改设备名称
+			</view>
+			<input type="text" v-model="name" placeholder="请输入设备名称"/>
+			<view class="btnanniu">
+				<view class="quxiao" @click="editnameflag = false">
+					取消
+				</view>
+				<view class="queren" @click="btneditname">
+					确认
+				</view>
+			</view>
+		</view>
 		<!-- <view class="mask" v-if="xuanzeflag"></view>
 		<view class="xuanze" v-if="xuanzeflag">
 			<view class="top">
@@ -171,7 +190,9 @@
 				deviceId:'',
 				xxobj:{},
 				xuanzeflag:false,
-				xianshiflag:true
+				editnameflag:false,
+				name:'',
+				mdianobj:{}
 			}
 		},
 		onLoad(option) {
@@ -179,6 +200,38 @@
 			this.getxx()
 		},
 		methods: {
+			// 点击确定修改设备名称
+			btneditname(){
+				let data = {
+					deviceName:this.name
+				}
+				this.$u.post(`/app/device/editName/${this.deviceId}?deviceName=${this.name}`,data).then(res =>{
+					if(res.code == 200){
+						this.getxx()
+						this.name = ''
+						this.editnameflag = false
+						uni.showToast({
+							title: '修改成功',
+							icon: 'success',
+							duration: 2000
+						})
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+				})
+			},
+			// 查询设备的门店
+			getmendian(){
+				this.$u.get(`app/store/mch/${this.xxobj.storeId}`).then(res => {
+					if (res.code == 200) {
+						this.mdianobj = res.data
+					}
+				})
+			},
 			// 点击选择门店
 			btnshop(){
 				uni.navigateTo({
@@ -190,11 +243,8 @@
 				this.$u.get(`/app/device/${this.deviceId}`).then(res => {
 					if (res.code == 200) {
 						this.xxobj = res.data
-						if(res.data.placementStatus ==  null || res.data.placementStatus == 2){
-							this.xianshiflag = true
-						}else{
-							this.xuanzeflag = false
-						}
+						this.getmendian()
+						this.name = this.xxobj.deviceName
 					}
 				})
 			},
@@ -240,6 +290,50 @@
 		padding-bottom: 20rpx;
 		box-sizing: border-box;
 	}
+	.editname{
+		width: 580rpx;
+		max-height: 400rpx;
+		background-color: #fff;
+		border-radius: 24rpx;
+		position: fixed;
+		top: 414rpx;
+		left: 50%;
+		transform: translateX(-50%);
+		.btnanniu{
+			display: flex;
+			margin-top: 60rpx;
+			border-top: 1px solid #D8D8D8;
+			.quxiao{
+				border-right: 1px solid #D8D8D8;
+			}
+			view{
+				width: 50%;
+				height: 120rpx;
+				line-height: 120rpx;
+				text-align: center;
+				font-size: 32rpx;
+				font-weight: 600;
+			}
+		}
+		input{
+			width: 480rpx;
+			height: 80rpx;
+			line-height: 80rpx;
+			margin: auto;
+			background-color: #D8D8D8;
+			margin-top: 50rpx;
+			padding-left: 30rpx;
+			box-sizing: border-box;
+			border-radius: 10rpx;
+		}
+		.top{
+			font-size: 32rpx;
+			font-weight: 600;
+			text-align: center;
+			width: 100%;
+			margin-top: 30rpx;
+		}
+	}
 	.jieb{
 		width: 750rpx;
 		height: 152rpx;
diff --git a/page_shanghu/toufsb.vue b/page_shanghu/toufsb.vue
index d4eee57..197dc2d 100644
--- a/page_shanghu/toufsb.vue
+++ b/page_shanghu/toufsb.vue
@@ -142,12 +142,14 @@
 				kstime:'',
 				kstj:'',
 				ksfsid:'',
-				kstjid:''
+				kstjid:'',
+				deviceId:''
 			}
 		},
 		onLoad(option) {
             this.storeId = option.storeId
 			this.sn = option.sn
+			this.deviceId = option.deviceId
 			this.getxx()
 		},
 		methods: {
diff --git a/page_shanghu/weishebei.vue b/page_shanghu/weishebei.vue
index 6a1dfc6..50d9590 100644
--- a/page_shanghu/weishebei.vue
+++ b/page_shanghu/weishebei.vue
@@ -6,7 +6,7 @@
 		<view class="list" 
 		  @touchstart="onTouchStart"
 		  @touchend="onTouchEnd">
-			<view class="list_item" v-for="(item,index) in list" :key="index" @click="btnedit(item.sn)">
+			<view class="list_item" v-for="(item,index) in list" :key="index" @click="btnedit(item.sn,item.deviceId)">
 				<view class="top">
 					<view class="sn">SN:{{item.sn}}</view>
 					<view class="zt" style="color: #48893B;" v-if="item.onlineStatus == 1">
@@ -20,7 +20,7 @@
 					<image :src="item.picture" mode=""></image>
 					<view class="sbxx">
 						<view class="">
-							门店名称：{{item.storeName == null ? '--' : item.storeName}}
+							设备名称：{{item.deviceName == null ? '--' : item.deviceName}}
 						</view>
 						<view class="">
 							投放位置：--
@@ -31,14 +31,14 @@
 						</view>
 					</view>
 				</view>
-				<view class="sbm">
+				<!-- <view class="sbm">
 					<text></text>
 					<view class="">
 						设备码
 					</view>
-				</view>
+				</view> -->
 			</view>
-			<view class="" style="width: 100%;text-align: center;margin-top: 100rpx;font-size: 34rpx;color: #ccc;">
+			<view class="" style="width: 100%;text-align: center;margin-top: 50rpx;font-size: 34rpx;color: #ccc;">
 				没有更多设备啦...
 			</view>
 		</view>
@@ -79,9 +79,9 @@
 		},
 		methods: {
 			// 点击跳转到设备信息页
-			btnedit(sn){
+			btnedit(sn,deviceId){
 				uni.navigateTo({
-					url:'/page_shanghu/toufsb?storeId=' + this.storeId + '&sn=' + sn
+					url:'/page_shanghu/toufsb?storeId=' + this.storeId + '&sn=' + sn + '&deviceId=' + deviceId
 				})
 			},
 			// 请求所有设备列表
@@ -148,7 +148,7 @@
 	}
 	.list{
 		width: 100%;
-		height: 1230rpx;
+		height: 1430rpx;
 		overflow: scroll;
 		padding-bottom: 50rpx;
 		box-sizing: border-box;
diff --git a/page_shanghu/xuanzeshop.vue b/page_shanghu/xuanzeshop.vue
index 98e3418..a1234fe 100644
--- a/page_shanghu/xuanzeshop.vue
+++ b/page_shanghu/xuanzeshop.vue
@@ -73,11 +73,11 @@
 		},
 		methods: {
 			// 点击跳转到选择房间
-			btnroom(){
-				uni.navigateTo({
-					url:'/page_shanghu/shoproom?storeId='+ this.storeId + '&deviceId=' + this.deviceId
-				})
-			},
+			// btnroom(){
+			// 	uni.navigateTo({
+			// 		url:'/page_shanghu/shoproom?storeId='+ this.storeId + '&deviceId=' + this.deviceId
+			// 	})
+			// },
 			// 点击新建门店
 			btnadd(){
 				uni.navigateTo({
@@ -89,7 +89,7 @@
 				// this.activeindex = index
 				this.storeId = storeId
 				uni.navigateTo({
-					url:'/page_shanghu/bangding?storeId=' + storeId
+					url:'/page_shanghu/bangding?storeId=' + storeId + '&deviceId=' + this.deviceId
 				})
 			},
 			// 请求本人所有门店
diff --git a/pages.json b/pages.json
index bda94a3..4527007 100644
--- a/pages.json
+++ b/pages.json
@@ -321,6 +321,34 @@
 						"enablePullDownRefresh": false,
 						"navigationStyle": "custom"
 					}
+				},{
+					"path": "roomxq",
+					"style": {
+						"navigationBarTitleText": "上传",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},{
+					"path": "roomedit",
+					"style": {
+						"navigationBarTitleText": "上传",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},{
+					"path": "erwm",
+					"style": {
+						"navigationBarTitleText": "上传",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},{
+					"path": "editshop",
+					"style": {
+						"navigationBarTitleText": "上传",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
 				}
 			]
 		}, {
@@ -347,6 +375,13 @@
 						"enablePullDownRefresh": false,
 						"navigationStyle": "custom"
 					}
+				},{
+					"path": "toufcesuo",
+					"style": {
+						"navigationBarTitleText": "上传",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
 				}
 			]
 		}, {