diff --git a/common/js/api.js b/common/js/api.js
index bf078f0..cdec843 100644
--- a/common/js/api.js
+++ b/common/js/api.js
@@ -48,6 +48,10 @@ export default {
 	paymemeberIn(data) { //充值
 		return uni.api.post("/pay/memeberIn", data);
 	},
+	// 支付
+	payOrderPay(data){
+		return uni.api.post("/pay/orderPay", data);
+	},
 	paymodfiyOrderInfo(data) { //查询订单支付状态
 		return uni.api.post("/pay/modfiyOrderInfo", data);
 	},
diff --git a/components/tki-qrcode/qrcode.js b/components/tki-qrcode/qrcode.js
new file mode 100644
index 0000000..6ea6553
--- /dev/null
+++ b/components/tki-qrcode/qrcode.js
@@ -0,0 +1,1201 @@
+let QRCode = {};
+(function () {
+    /**
+     * 获取单个字符的utf8编码
+     * unicode BMP平面约65535个字符
+     * @param {num} code
+     * return {array}
+     */
+    function unicodeFormat8(code) {
+        // 1 byte
+        var c0, c1, c2;
+        if (code < 128) {
+            return [code];
+            // 2 bytes
+        } else if (code < 2048) {
+            c0 = 192 + (code >> 6);
+            c1 = 128 + (code & 63);
+            return [c0, c1];
+            // 3 bytes
+        } else {
+            c0 = 224 + (code >> 12);
+            c1 = 128 + (code >> 6 & 63);
+            c2 = 128 + (code & 63);
+            return [c0, c1, c2];
+        }
+    }
+    /**
+     * 获取字符串的utf8编码字节串
+     * @param {string} string
+     * @return {array}
+     */
+    function getUTF8Bytes(string) {
+        var utf8codes = [];
+        for (var i = 0; i < string.length; i++) {
+            var code = string.charCodeAt(i);
+            var utf8 = unicodeFormat8(code);
+            for (var j = 0; j < utf8.length; j++) {
+                utf8codes.push(utf8[j]);
+            }
+        }
+        return utf8codes;
+    }
+    /**
+     * 二维码算法实现
+     * @param {string} data              要编码的信息字符串
+     * @param {num} errorCorrectLevel 纠错等级
+     */
+    function QRCodeAlg(data, errorCorrectLevel) {
+        this.typeNumber = -1; //版本
+        this.errorCorrectLevel = errorCorrectLevel;
+        this.modules = null; //二维矩阵，存放最终结果
+        this.moduleCount = 0; //矩阵大小
+        this.dataCache = null; //数据缓存
+        this.rsBlocks = null; //版本数据信息
+        this.totalDataCount = -1; //可使用的数据量
+        this.data = data;
+        this.utf8bytes = getUTF8Bytes(data);
+        this.make();
+    }
+    QRCodeAlg.prototype = {
+        constructor: QRCodeAlg,
+        /**
+         * 获取二维码矩阵大小
+         * @return {num} 矩阵大小
+         */
+        getModuleCount: function () {
+            return this.moduleCount;
+        },
+        /**
+         * 编码
+         */
+        make: function () {
+            this.getRightType();
+            this.dataCache = this.createData();
+            this.createQrcode();
+        },
+        /**
+         * 设置二位矩阵功能图形
+         * @param  {bool} test 表示是否在寻找最好掩膜阶段
+         * @param  {num} maskPattern 掩膜的版本
+         */
+        makeImpl: function (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);
+            }
+            this.setupPositionProbePattern(0, 0);
+            this.setupPositionProbePattern(this.moduleCount - 7, 0);
+            this.setupPositionProbePattern(0, this.moduleCount - 7);
+            this.setupPositionAdjustPattern();
+            this.setupTimingPattern();
+            this.setupTypeInfo(true, maskPattern);
+            if (this.typeNumber >= 7) {
+                this.setupTypeNumber(true);
+            }
+            this.mapData(this.dataCache, maskPattern);
+        },
+        /**
+         * 设置二维码的位置探测图形
+         * @param  {num} row 探测图形的中心横坐标
+         * @param  {num} col 探测图形的中心纵坐标
+         */
+        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;
+                    }
+                }
+            }
+        },
+        /**
+         * 创建二维码
+         * @return {[type]} [description]
+         */
+        createQrcode: function () {
+            var minLostPoint = 0;
+            var pattern = 0;
+            var bestModules = null;
+            for (var i = 0; i < 8; i++) {
+                this.makeImpl(i);
+                var lostPoint = QRUtil.getLostPoint(this);
+                if (i == 0 || minLostPoint > lostPoint) {
+                    minLostPoint = lostPoint;
+                    pattern = i;
+                    bestModules = this.modules;
+                }
+            }
+            this.modules = bestModules;
+            this.setupTypeInfo(false, pattern);
+            if (this.typeNumber >= 7) {
+                this.setupTypeNumber(false);
+            }
+        },
+        /**
+         * 设置定位图形
+         * @return {[type]} [description]
+         */
+        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);
+                if (this.modules[6][r] != null) {
+                    continue;
+                }
+                this.modules[6][r] = (r % 2 == 0);
+            }
+        },
+        /**
+         * 设置矫正图形
+         * @return {[type]} [description]
+         */
+        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;
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        /**
+         * 设置版本信息（7以上版本才有）
+         * @param  {bool} test 是否处于判断最佳掩膜阶段
+         * @return {[type]}      [description]
+         */
+        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;
+                this.modules[i % 3 + this.moduleCount - 8 - 3][Math.floor(i / 3)] = mod;
+            }
+        },
+        /**
+         * 设置格式信息（纠错等级和掩膜版本）
+         * @param  {bool} test
+         * @param  {num} maskPattern 掩膜版本
+         * @return {}
+         */
+        setupTypeInfo: function (test, maskPattern) {
+            var data = (QRErrorCorrectLevel[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
+                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);
+        },
+        /**
+         * 数据编码
+         * @return {[type]} [description]
+         */
+        createData: function () {
+            var buffer = new QRBitBuffer();
+            var lengthBits = this.typeNumber > 9 ? 16 : 8;
+            buffer.put(4, 4); //添加模式
+            buffer.put(this.utf8bytes.length, lengthBits);
+            for (var i = 0, l = this.utf8bytes.length; i < l; i++) {
+                buffer.put(this.utf8bytes[i], 8);
+            }
+            if (buffer.length + 4 <= this.totalDataCount * 8) {
+                buffer.put(0, 4);
+            }
+            // padding
+            while (buffer.length % 8 != 0) {
+                buffer.putBit(false);
+            }
+            // padding
+            while (true) {
+                if (buffer.length >= this.totalDataCount * 8) {
+                    break;
+                }
+                buffer.put(QRCodeAlg.PAD0, 8);
+                if (buffer.length >= this.totalDataCount * 8) {
+                    break;
+                }
+                buffer.put(QRCodeAlg.PAD1, 8);
+            }
+            return this.createBytes(buffer);
+        },
+        /**
+         * 纠错码编码
+         * @param  {buffer} buffer 数据编码
+         * @return {[type]}
+         */
+        createBytes: function (buffer) {
+            var offset = 0;
+            var maxDcCount = 0;
+            var maxEcCount = 0;
+            var length = this.rsBlock.length / 3;
+            var rsBlocks = new Array();
+            for (var i = 0; i < length; i++) {
+                var count = this.rsBlock[i * 3 + 0];
+                var totalCount = this.rsBlock[i * 3 + 1];
+                var dataCount = this.rsBlock[i * 3 + 2];
+                for (var j = 0; j < count; j++) {
+                    rsBlocks.push([dataCount, totalCount]);
+                }
+            }
+            var dcdata = new Array(rsBlocks.length);
+            var ecdata = new Array(rsBlocks.length);
+            for (var r = 0; r < rsBlocks.length; r++) {
+                var dcCount = rsBlocks[r][0];
+                var ecCount = rsBlocks[r][1] - 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 data = new Array(this.totalDataCount);
+            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;
+
+        },
+        /**
+         * 布置模块，构建最终信息
+         * @param  {} data
+         * @param  {} maskPattern
+         * @return {}
+         */
+        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;
+                    }
+                }
+            }
+        }
+    };
+    /**
+     * 填充字段
+     */
+    QRCodeAlg.PAD0 = 0xEC;
+    QRCodeAlg.PAD1 = 0x11;
+    //---------------------------------------------------------------------
+    // 纠错等级对应的编码
+    //---------------------------------------------------------------------
+    var QRErrorCorrectLevel = [1, 0, 3, 2];
+    //---------------------------------------------------------------------
+    // 掩膜版本
+    //---------------------------------------------------------------------
+    var QRMaskPattern = {
+        PATTERN000: 0,
+        PATTERN001: 1,
+        PATTERN010: 2,
+        PATTERN011: 3,
+        PATTERN100: 4,
+        PATTERN101: 5,
+        PATTERN110: 6,
+        PATTERN111: 7
+    };
+    //---------------------------------------------------------------------
+    // 工具类
+    //---------------------------------------------------------------------
+    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),
+        /*
+        BCH编码格式信息
+         */
+        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;
+        },
+        /*
+        BCH编码版本信息
+         */
+        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;
+        },
+        /*
+        获取BCH位信息
+         */
+        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);
+            }
+        },
+        /*
+        获取RS的纠错多项式
+         */
+        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;
+        },
+        /*
+        获取评价
+         */
+        getLostPoint: function (qrCode) {
+            var moduleCount = qrCode.getModuleCount(),
+                lostPoint = 0,
+                darkCount = 0;
+            for (var row = 0; row < moduleCount; row++) {
+                var sameCount = 0;
+                var head = qrCode.modules[row][0];
+                for (var col = 0; col < moduleCount; col++) {
+                    var current = qrCode.modules[row][col];
+                    //level 3 评价
+                    if (col < moduleCount - 6) {
+                        if (current && !qrCode.modules[row][col + 1] && qrCode.modules[row][col + 2] && qrCode.modules[row][col + 3] && qrCode.modules[row][col + 4] && !qrCode.modules[row][col + 5] && qrCode.modules[row][col + 6]) {
+                            if (col < moduleCount - 10) {
+                                if (qrCode.modules[row][col + 7] && qrCode.modules[row][col + 8] && qrCode.modules[row][col + 9] && qrCode.modules[row][col + 10]) {
+                                    lostPoint += 40;
+                                }
+                            } else if (col > 3) {
+                                if (qrCode.modules[row][col - 1] && qrCode.modules[row][col - 2] && qrCode.modules[row][col - 3] && qrCode.modules[row][col - 4]) {
+                                    lostPoint += 40;
+                                }
+                            }
+                        }
+                    }
+                    //level 2 评价
+                    if ((row < moduleCount - 1) && (col < moduleCount - 1)) {
+                        var count = 0;
+                        if (current) count++;
+                        if (qrCode.modules[row + 1][col]) count++;
+                        if (qrCode.modules[row][col + 1]) count++;
+                        if (qrCode.modules[row + 1][col + 1]) count++;
+                        if (count == 0 || count == 4) {
+                            lostPoint += 3;
+                        }
+                    }
+                    //level 1 评价
+                    if (head ^ current) {
+                        sameCount++;
+                    } else {
+                        head = current;
+                        if (sameCount >= 5) {
+                            lostPoint += (3 + sameCount - 5);
+                        }
+                        sameCount = 1;
+                    }
+                    //level 4 评价
+                    if (current) {
+                        darkCount++;
+                    }
+                }
+            }
+            for (var col = 0; col < moduleCount; col++) {
+                var sameCount = 0;
+                var head = qrCode.modules[0][col];
+                for (var row = 0; row < moduleCount; row++) {
+                    var current = qrCode.modules[row][col];
+                    //level 3 评价
+                    if (row < moduleCount - 6) {
+                        if (current && !qrCode.modules[row + 1][col] && qrCode.modules[row + 2][col] && qrCode.modules[row + 3][col] && qrCode.modules[row + 4][col] && !qrCode.modules[row + 5][col] && qrCode.modules[row + 6][col]) {
+                            if (row < moduleCount - 10) {
+                                if (qrCode.modules[row + 7][col] && qrCode.modules[row + 8][col] && qrCode.modules[row + 9][col] && qrCode.modules[row + 10][col]) {
+                                    lostPoint += 40;
+                                }
+                            } else if (row > 3) {
+                                if (qrCode.modules[row - 1][col] && qrCode.modules[row - 2][col] && qrCode.modules[row - 3][col] && qrCode.modules[row - 4][col]) {
+                                    lostPoint += 40;
+                                }
+                            }
+                        }
+                    }
+                    //level 1 评价
+                    if (head ^ current) {
+                        sameCount++;
+                    } else {
+                        head = current;
+                        if (sameCount >= 5) {
+                            lostPoint += (3 + sameCount - 5);
+                        }
+                        sameCount = 1;
+                    }
+                }
+            }
+            // LEVEL4
+            var ratio = Math.abs(100 * darkCount / moduleCount / moduleCount - 50) / 5;
+            lostPoint += ratio * 10;
+            return lostPoint;
+        }
+
+    };
+    //---------------------------------------------------------------------
+    // QRMath使用的数学工具
+    //---------------------------------------------------------------------
+    var QRMath = {
+        /*
+        将n转化为a^m
+         */
+        glog: function (n) {
+            if (n < 1) {
+                throw new Error("glog(" + n + ")");
+            }
+            return QRMath.LOG_TABLE[n];
+        },
+        /*
+        将a^m转化为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 多项式
+    //---------------------------------------------------------------------
+    /**
+     * 多项式类
+     * @param {Array} num   系数
+     * @param {num} shift a^shift
+     */
+    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;
+        },
+        /**
+         * 多项式乘法
+         * @param  {QRPolynomial} e 被乘多项式
+         * @return {[type]}   [description]
+         */
+        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);
+        },
+        /**
+         * 多项式模运算
+         * @param  {QRPolynomial} e 模多项式
+         * @return {}
+         */
+        mod: function (e) {
+            var tl = this.getLength(),
+                el = e.getLength();
+            if (tl - el < 0) {
+                return this;
+            }
+            var num = new Array(tl);
+            for (var i = 0; i < tl; i++) {
+                num[i] = this.get(i);
+            }
+            while (num.length >= el) {
+                var ratio = QRMath.glog(num[0]) - QRMath.glog(e.get(0));
+
+                for (var i = 0; i < e.getLength(); i++) {
+                    num[i] ^= QRMath.gexp(QRMath.glog(e.get(i)) + ratio);
+                }
+                while (num[0] == 0) {
+                    num.shift();
+                }
+            }
+            return new QRPolynomial(num, 0);
+        }
+    };
+
+    //---------------------------------------------------------------------
+    // RS_BLOCK_TABLE
+    //---------------------------------------------------------------------
+    /*
+    二维码各个版本信息[块数, 每块中的数据块数, 每块中的信息块数]
+     */
+    var 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]
+    ];
+
+    /**
+     * 根据数据获取对应版本
+     * @return {[type]} [description]
+     */
+    QRCodeAlg.prototype.getRightType = function () {
+        for (var typeNumber = 1; typeNumber < 41; typeNumber++) {
+            var rsBlock = RS_BLOCK_TABLE[(typeNumber - 1) * 4 + this.errorCorrectLevel];
+            if (rsBlock == undefined) {
+                throw new Error("bad rs block @ typeNumber:" + typeNumber + "/errorCorrectLevel:" + this.errorCorrectLevel);
+            }
+            var length = rsBlock.length / 3;
+            var totalDataCount = 0;
+            for (var i = 0; i < length; i++) {
+                var count = rsBlock[i * 3 + 0];
+                var dataCount = rsBlock[i * 3 + 2];
+                totalDataCount += dataCount * count;
+            }
+            var lengthBytes = typeNumber > 9 ? 2 : 1;
+            if (this.utf8bytes.length + lengthBytes < totalDataCount || typeNumber == 40) {
+                this.typeNumber = typeNumber;
+                this.rsBlock = rsBlock;
+                this.totalDataCount = totalDataCount;
+                break;
+            }
+        }
+    };
+
+    //---------------------------------------------------------------------
+    // 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);
+        },
+        put: function (num, length) {
+            for (var i = 0; i < length; i++) {
+                this.putBit(((num >>> (length - i - 1)) & 1));
+            }
+        },
+        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++;
+        }
+    };
+
+
+
+    // xzedit
+    let qrcodeAlgObjCache = [];
+    /**
+     * 二维码构造函数，主要用于绘制
+     * @param  {参数列表} opt 传递参数
+     * @return {}
+     */
+    QRCode = function (opt) {
+        //设置默认参数
+        this.options = {
+            text: '',
+            size: 256,
+            correctLevel: 3,
+            background: '#ffffff',
+            foreground: '#000000',
+            pdground: '#000000',
+            image: '',
+            imageSize: 30,
+            canvasId: opt.canvasId,
+            context: opt.context,
+            usingComponents: opt.usingComponents,
+            showLoading: opt.showLoading,
+            loadingText: opt.loadingText,
+        };
+        if (typeof opt === 'string') { // 只编码ASCII字符串
+            opt = {
+                text: opt
+            };
+        }
+        if (opt) {
+            for (var i in opt) {
+                this.options[i] = opt[i];
+            }
+        }
+        //使用QRCodeAlg创建二维码结构
+        var qrCodeAlg = null;
+        for (var i = 0, l = qrcodeAlgObjCache.length; i < l; i++) {
+            if (qrcodeAlgObjCache[i].text == this.options.text && qrcodeAlgObjCache[i].text.correctLevel == this.options.correctLevel) {
+                qrCodeAlg = qrcodeAlgObjCache[i].obj;
+                break;
+            }
+        }
+        if (i == l) {
+            qrCodeAlg = new QRCodeAlg(this.options.text, this.options.correctLevel);
+            qrcodeAlgObjCache.push({
+                text: this.options.text,
+                correctLevel: this.options.correctLevel,
+                obj: qrCodeAlg
+            });
+        }
+        /**
+         * 计算矩阵点的前景色
+         * @param {Obj} config
+         * @param {Number} config.row 点x坐标
+         * @param {Number} config.col 点y坐标
+         * @param {Number} config.count 矩阵大小
+         * @param {Number} config.options 组件的options
+         * @return {String}
+         */
+        let getForeGround = function (config) {
+            var options = config.options;
+            if (options.pdground && (
+                (config.row > 1 && config.row < 5 && config.col > 1 && config.col < 5) ||
+                (config.row > (config.count - 6) && config.row < (config.count - 2) && config.col > 1 && config.col < 5) ||
+                (config.row > 1 && config.row < 5 && config.col > (config.count - 6) && config.col < (config.count - 2))
+            )) {
+                return options.pdground;
+            }
+            return options.foreground;
+        }
+        // 创建canvas
+        let createCanvas = function (options) {
+            if (options.showLoading) {
+                uni.showLoading({
+                    title: options.loadingText,
+                    mask: true
+                });
+            }
+            var ctx = uni.createCanvasContext(options.canvasId, options.context);
+            var count = qrCodeAlg.getModuleCount();
+            var ratioSize = options.size;
+            var ratioImgSize = options.imageSize;
+            //计算每个点的长宽
+            var tileW = (ratioSize / count).toPrecision(4);
+            var tileH = (ratioSize / count).toPrecision(4);
+            //绘制
+            for (var row = 0; row < count; row++) {
+                for (var col = 0; col < count; col++) {
+                    var w = (Math.ceil((col + 1) * tileW) - Math.floor(col * tileW));
+                    var h = (Math.ceil((row + 1) * tileW) - Math.floor(row * tileW));
+                    var foreground = getForeGround({
+                        row: row,
+                        col: col,
+                        count: count,
+                        options: options
+                    });
+                    ctx.setFillStyle(qrCodeAlg.modules[row][col] ? foreground : options.background);
+                    ctx.fillRect(Math.round(col * tileW), Math.round(row * tileH), w, h);
+                }
+            }
+            if (options.image) {
+                var x = Number(((ratioSize - ratioImgSize) / 2).toFixed(2));
+                var y = Number(((ratioSize - ratioImgSize) / 2).toFixed(2));
+                drawRoundedRect(ctx, x, y, ratioImgSize, ratioImgSize, 2, 6, true, true)
+                ctx.drawImage(options.image, x, y, ratioImgSize, ratioImgSize);
+                // 画圆角矩形
+                function drawRoundedRect(ctxi, x, y, width, height, r, lineWidth, fill, stroke) {
+                    ctxi.setLineWidth(lineWidth);
+                    ctxi.setFillStyle(options.background);
+                    ctxi.setStrokeStyle(options.background);
+                    ctxi.beginPath(); // draw top and top right corner 
+                    ctxi.moveTo(x + r, y);
+                    ctxi.arcTo(x + width, y, x + width, y + r, r); // draw right side and bottom right corner 
+                    ctxi.arcTo(x + width, y + height, x + width - r, y + height, r); // draw bottom and bottom left corner 
+                    ctxi.arcTo(x, y + height, x, y + height - r, r); // draw left and top left corner 
+                    ctxi.arcTo(x, y, x + r, y, r);
+                    ctxi.closePath();
+                    if (fill) {
+                        ctxi.fill();
+                    }
+                    if (stroke) {
+                        ctxi.stroke();
+                    }
+                }
+            }
+            setTimeout(() => {
+                ctx.draw(true, () => {
+                    // 保存到临时区域
+                    setTimeout(() => {
+                        uni.canvasToTempFilePath({
+                            width: options.width,
+                            height: options.height,
+                            destWidth: options.width,
+                            destHeight: options.height,
+                            canvasId: options.canvasId,
+                            quality: Number(1),
+                            success: function (res) {
+                                if (options.cbResult) {
+                                    options.cbResult(res.tempFilePath)
+                                }
+                            },
+                            fail: function (res) {
+                                if (options.cbResult) {
+                                    options.cbResult(res)
+                                }
+                            },
+                            complete: function () {
+                                if (options.showLoading){
+                                    uni.hideLoading();
+                                }
+                            },
+                        }, options.context);
+                    }, options.text.length + 100);
+                });
+            }, options.usingComponents ? 0 : 150);
+        }
+        createCanvas(this.options);
+        // 空判定
+        let empty = function (v) {
+            let tp = typeof v,
+                rt = false;
+            if (tp == "number" && String(v) == "") {
+                rt = true
+            } else if (tp == "undefined") {
+                rt = true
+            } else if (tp == "object") {
+                if (JSON.stringify(v) == "{}" || JSON.stringify(v) == "[]" || v == null) rt = true
+            } else if (tp == "string") {
+                if (v == "" || v == "undefined" || v == "null" || v == "{}" || v == "[]") rt = true
+            } else if (tp == "function") {
+                rt = false
+            }
+            return rt
+        }
+    };
+    QRCode.prototype.clear = function (fn) {
+        var ctx = uni.createCanvasContext(this.options.canvasId, this.options.context)
+        ctx.clearRect(0, 0, this.options.size, this.options.size)
+        ctx.draw(false, () => {
+            if (fn) {
+                fn()
+            }
+        })
+    };
+})()
+
+export default QRCode
\ No newline at end of file
diff --git a/components/tki-qrcode/tki-qrcode.vue b/components/tki-qrcode/tki-qrcode.vue
new file mode 100644
index 0000000..f1bb6de
--- /dev/null
+++ b/components/tki-qrcode/tki-qrcode.vue
@@ -0,0 +1,210 @@
+<template xlang="wxml" minapp="mpvue">
+	<view class="tki-qrcode">
+		<!-- #ifndef MP-ALIPAY -->
+		<canvas class="tki-qrcode-canvas" :canvas-id="cid" :style="{width:cpSize+'px',height:cpSize+'px'}" />
+		<!-- #endif -->
+		<!-- #ifdef MP-ALIPAY -->
+		<canvas :id="cid" :width="cpSize" :height="cpSize" class="tki-qrcode-canvas" />
+		<!-- #endif -->
+		<image v-show="show" :src="result" :style="{width:cpSize+'px',height:cpSize+'px'}" />
+	</view>
+</template>
+
+<script>
+import QRCode from "./qrcode.js"
+let qrcode
+export default {
+	name: "tki-qrcode",
+	props: {
+		cid: {
+			type: String,
+			default: 'tki-qrcode-canvas'
+		},
+		size: {
+			type: Number,
+			default: 200
+		},
+		unit: {
+			type: String,
+			default: 'upx'
+		},
+		show: {
+			type: Boolean,
+			default: true
+		},
+		val: {
+			type: String,
+			default: ''
+		},
+		background: {
+			type: String,
+			default: '#ffffff'
+		},
+		foreground: {
+			type: String,
+			default: '#000000'
+		},
+		pdground: {
+			type: String,
+			default: '#000000'
+		},
+		icon: {
+			type: String,
+			default: ''
+		},
+		iconSize: {
+			type: Number,
+			default: 40
+		},
+		lv: {
+			type: Number,
+			default: 3
+		},
+		onval: {
+			type: Boolean,
+			default: false
+		},
+		loadMake: {
+			type: Boolean,
+			default: false
+		},
+		usingComponents: {
+			type: Boolean,
+			default: true
+		},
+		showLoading: {
+			type: Boolean,
+			default: true
+		},
+		loadingText: {
+			type: String,
+			default: '二维码生成中'
+		},
+	},
+	data() {
+		return {
+			result: '',
+		}
+	},
+	methods: {
+		_makeCode() {
+			let that = this
+			if (!this._empty(this.val)) {
+				qrcode = new QRCode({
+					context: that, // 上下文环境
+					canvasId:that.cid, // canvas-id
+					usingComponents: that.usingComponents, // 是否是自定义组件
+					showLoading: that.showLoading, // 是否显示loading
+					loadingText: that.loadingText, // loading文字
+					text: that.val, // 生成内容
+					size: that.cpSize, // 二维码大小
+					background: that.background, // 背景色
+					foreground: that.foreground, // 前景色
+					pdground: that.pdground, // 定位角点颜色
+					correctLevel: that.lv, // 容错级别
+					image: that.icon, // 二维码图标
+					imageSize: that.iconSize,// 二维码图标大小
+					cbResult: function (res) { // 生成二维码的回调
+						that._result(res)
+					},
+				});
+			} else {
+				uni.showToast({
+					title: '二维码内容不能为空',
+					icon: 'none',
+					duration: 2000
+				});
+			}
+		},
+		_clearCode() {
+			this._result('')
+			qrcode.clear()
+		},
+		_saveCode() {
+			let that = this;
+			if (this.result != "") {
+				uni.saveImageToPhotosAlbum({
+					filePath: that.result,
+					success: function () {
+						uni.showToast({
+							title: '二维码保存成功',
+							icon: 'success',
+							duration: 2000
+						});
+					}
+				});
+			}
+		},
+		_result(res) {
+			this.result = res;
+			this.$emit('result', res)
+		},
+		_empty(v) {
+			let tp = typeof v,
+				rt = false;
+			if (tp == "number" && String(v) == "") {
+				rt = true
+			} else if (tp == "undefined") {
+				rt = true
+			} else if (tp == "object") {
+				if (JSON.stringify(v) == "{}" || JSON.stringify(v) == "[]" || v == null) rt = true
+			} else if (tp == "string") {
+				if (v == "" || v == "undefined" || v == "null" || v == "{}" || v == "[]") rt = true
+			} else if (tp == "function") {
+				rt = false
+			}
+			return rt
+		}
+	},
+	watch: {
+		size: function (n, o) {
+			if (n != o && !this._empty(n)) {
+				this.cSize = n
+				if (!this._empty(this.val)) {
+					setTimeout(() => {
+						this._makeCode()
+					}, 100);
+				}
+			}
+		},
+		val: function (n, o) {
+			if (this.onval) {
+				if (n != o && !this._empty(n)) {
+					setTimeout(() => {
+						this._makeCode()
+					}, 0);
+				}
+			}
+		}
+	},
+	computed: {
+		cpSize() {
+			if(this.unit == "upx"){
+				return uni.upx2px(this.size)
+			}else{
+				return this.size
+			}
+		}
+	},
+	mounted: function () {
+		if (this.loadMake) {
+			if (!this._empty(this.val)) {
+				setTimeout(() => {
+					this._makeCode()
+				}, 0);
+			}
+		}
+	},
+}
+</script>
+<style>
+.tki-qrcode {
+  position: relative;
+}
+.tki-qrcode-canvas {
+  position: fixed;
+  top: -99999upx;
+  left: -99999upx;
+  z-index: -99999;
+}
+</style>
diff --git a/pages/group_order/components/groupCoupons.vue b/pages/group_order/components/groupCoupons.vue
index ae2efda..ce9290a 100644
--- a/pages/group_order/components/groupCoupons.vue
+++ b/pages/group_order/components/groupCoupons.vue
@@ -1,22 +1,104 @@
 <template>
-	<view>
-		2
+	<view class="Box">
+		<view class="fontStyle">
+			<image src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/Meituanquan.png"
+				style="width: 39.46rpx;height: 40rpx;" mode=""></image>
+			<text>美团券</text>
+		</view>
+		<view class="content">
+			{{info.expDate}}
+		</view>
+		<button v-if="info.refundAble=='1'" class="buttonStyle" @click="makephone(info.phone)">申请退款</button>
+		<view style="height: 2rpx;width: 100%;background-color: #EFEFEF;margin-top: 16rpx;"> </view>
+		<view class="rightStyle" v-for="(item,i) in info.coupons" >
+			<text>
+				{{item.couponNo}}
+			</text>
+			<image src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/QRcode.png" v-if="info.status=='unused'"
+				style="width: 39.46rpx;height: 40rpx;margin-right: 50rpx;" mode="" @click="openQR"></image>
+			<text v-else>已退款</text>
+		</view>
 	</view>
 </template>
 
 <script>
 	export default {
+		props: ['info'],
 		data() {
 			return {
-				
+
 			}
 		},
 		methods: {
-			
+			makephone(e) {
+				uni.makePhoneCall({
+					phoneNumber: e
+				});
+			},
+			openQR() {
+				this.$emit('clickEvent')
+			}
 		}
 	}
 </script>
 
-<style>
+<style lang="less" scoped>
+	.Box {
+		width: 750rpx;
+		background: #FFFFFF;
+		border-radius: 16rpx 16rpx 16rpx 16rpx;
+		padding: 32rpx 64rpx;
+		margin-top: 32rpx;
+		position: relative;
 
-</style>
+		.fontStyle {
+			.df;
+
+			>text {
+				font-weight: 500;
+				font-size: 28rpx;
+				color: #333333;
+				margin-left: 12rpx
+			}
+		}
+
+		.content {
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #999999;
+			margin-top: 16rpx;
+		}
+
+		.buttonStyle {
+			position: absolute;
+			right: 58rpx;
+			top: 56rpx;
+			width: 180rpx;
+			height: 70rpx;
+			line-height: 70rpx;
+			background: #FFFFFF;
+			border-radius: 10rpx 10rpx 10rpx 10rpx;
+			border: 2rpx solid #E8E8E8;
+			font-size: 28rpx;
+			color: #000;
+		}
+
+		.rightStyle {
+			.df(space-between);
+			margin-top: 16rpx;
+			font-weight: bold;
+			font-size: 28rpx;
+			color: #333333;
+		}
+	}
+
+	.ml-20 {
+		margin-left: 20rpx;
+	}
+
+	.df(@start: flex-start, @position: center) {
+		display: flex;
+		justify-content: @start;
+		align-items: @position;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/group_order/components/groupMerchants.vue b/pages/group_order/components/groupMerchants.vue
index a1312d5..fffada6 100644
--- a/pages/group_order/components/groupMerchants.vue
+++ b/pages/group_order/components/groupMerchants.vue
@@ -1,22 +1,103 @@
 <template>
-	<view>
-		3
+	<view class="Box">
+		<view class="fontStyle">
+			<image src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/shangdian.png"
+				style="width: 40rpx;height: 36.44rpx;" mode=""></image>
+			<text>商家信息</text>
+		</view>
+		<view class="content">
+			{{info.shopName}}
+		</view>
+		<view class="addreeStyle">
+			<image src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/dingwei.png"
+				style="width: 17.9rpx;height: 22rpx;margin-right: 6rpx;" mode=""></image>{{info.distances}}km |
+			{{info.address}}
+		</view>
+		<view class="rightStyle">
+			<image src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/dianhua.png" @click="makephone(info.phone)"
+				style="width: 39.46rpx;height: 40rpx;margin-right: 50rpx;" mode=""></image>
+		</view>
 	</view>
 </template>
 
 <script>
 	export default {
+		props: ['info'],
 		data() {
 			return {
-				
+
 			}
 		},
 		methods: {
-			
+			makephone(e) {
+				uni.makePhoneCall({
+					phoneNumber: e
+				});
+			}
 		}
 	}
 </script>
 
-<style>
+<style lang="less" scoped>
+	.Box {
+		width: 750rpx;
+		background: #FFFFFF;
+		border-radius: 16rpx 16rpx 16rpx 16rpx;
+		padding: 32rpx 64rpx;
+		margin-top: 32rpx;
+		position: relative;
 
-</style>
+		.fontStyle {
+			.df;
+
+			>text {
+				font-weight: 500;
+				font-size: 28rpx;
+				color: #333333;
+				margin-left: 12rpx
+			}
+		}
+
+		.content {
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #333333;
+			margin-top: 32rpx;
+		}
+
+		.buttonStyle {
+			width: 158rpx;
+			height: 56rpx;
+			background: #FFFFFF;
+			border-radius: 10rpx 10rpx 10rpx 10rpx;
+			border: 2rpx solid #E8E8E8;
+			position: absolute;
+			right: 58rpx;
+			top: 56rpx;
+		}
+
+		.addreeStyle {
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #999999;
+			margin-top: 22rpx;
+			.df;
+		}
+
+		.rightStyle {
+			position: absolute;
+			right: 30rpx;
+			top: 126rpx;
+		}
+	}
+
+	.ml-20 {
+		margin-left: 20rpx;
+	}
+
+	.df(@start: flex-start, @position: center) {
+		display: flex;
+		justify-content: @start;
+		align-items: @position;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/group_order/components/groupOrderInfo.vue b/pages/group_order/components/groupOrderInfo.vue
new file mode 100644
index 0000000..42cb46c
--- /dev/null
+++ b/pages/group_order/components/groupOrderInfo.vue
@@ -0,0 +1,127 @@
+<template>
+	<view class="Box">
+		<view class="fontStyle">
+			<image src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/sfmoney.png"
+				style="width: 28.29rpx;height: 31.93rpx;" mode=""></image>
+			<text>订单信息</text>
+		</view>
+		<view class="content">
+			<view>
+				<text>订</text> <text>单</text> <text>号:</text>
+			</view>
+			<text>{{info.orderNo}}</text>
+		</view>
+		<view class="content">
+			<view>
+				<text>手</text> <text>机</text> <text>号:</text>
+			</view>
+			<text>{{info.phone}}</text>
+		</view>
+		<view class="content">
+			<view>
+				<text>付</text> <text>款</text> <text>时</text> <text>间:</text>
+			</view>
+			<text>{{info.payTime}}</text>
+		</view>
+		<view class="content">
+			<view>
+				<text>数</text> <text>量:</text>
+			</view>
+			<text>{{info.number}}</text>
+		</view>
+		<view class="content">
+			<view>
+				<text>总</text> <text>价:</text>
+			</view>
+			<text>{{info.orderAmount}}</text>
+		</view>
+		<view class="content">
+			<view>
+				<text>优</text> <text>惠</text> <text>明</text> <text>细:</text>
+			</view>
+			<text style="color: #FF4C11;">{{info.saveAmount}}</text>
+		</view>
+		<view class="content">
+			<view>
+				<text>待</text><text>支</text> <text>付:</text>
+			</view>
+			<text>{{info.payAmount}}</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: ['info'],
+		data() {
+			return {}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.Box {
+		width: 750rpx;
+		background: #FFFFFF;
+		border-radius: 16rpx 16rpx 16rpx 16rpx;
+		padding: 32rpx 64rpx;
+		margin-top: 32rpx;
+		position: relative;
+
+		.fontStyle {
+			.df;
+
+			>text {
+				font-weight: 500;
+				font-size: 28rpx;
+				color: #333333;
+				margin-left: 12rpx
+			}
+		}
+
+		.content {
+			.df(flex-start, stretch);
+			margin-top: 16rpx;
+			margin-left: 20rpx;
+
+			>view {
+				>text {
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #666666;
+				}
+
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #666666;
+				margin-right: 50rpx;
+				width: 120rpx;
+				.df(space-between)
+			}
+
+			>text {
+
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #333333;
+
+			}
+
+		}
+
+
+	}
+
+	.ml-20 {
+		margin-left: 20rpx;
+	}
+
+	.df(@start: flex-start, @position: center) {
+		display: flex;
+		justify-content: @start;
+		align-items: @position;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/group_order/components/groupPay.vue b/pages/group_order/components/groupPay.vue
index e77fefa..61e4a34 100644
--- a/pages/group_order/components/groupPay.vue
+++ b/pages/group_order/components/groupPay.vue
@@ -1,22 +1,131 @@
 <template>
-	<view>
-		6
+	<view class="Box">
+		<view class="fontStyle">
+			<image src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/sfmoney.png"
+				style="width: 28.29rpx;height: 31.93rpx;" mode=""></image>
+			<text>实付金额</text>
+			<text>￥{{info.payAmount}}</text>
+		</view>
+		<view class="content">
+			<view>
+				<text>订</text> <text>单</text> <text>号:</text>
+			</view>
+			<text>{{info.orderNo}}</text>
+		</view>
+		<view class="content">
+			<view>
+				<text>手</text> <text>机</text> <text>号:</text>
+			</view>
+			<text>{{info.phone}}</text>
+		</view>
+		<view class="content">
+			<view>
+				<text>付</text> <text>款</text> <text>时</text> <text>间:</text>
+			</view>
+			<text>{{info.payTime}}</text>
+		</view>
+		<view class="content">
+			<view>
+				<text>数</text> <text>量:</text>
+			</view>
+			<text>{{info.number}}</text>
+		</view>
+		<view class="content">
+			<view>
+				<text>总</text> <text>价:</text>
+			</view>
+			<text>{{info.orderAmount}}</text>
+		</view>
+		<view class="content">
+			<view>
+				<text>实</text> <text>付:</text>
+			</view>
+			<text>{{info.payAmount}}</text>
+		</view>
 	</view>
 </template>
 
 <script>
 	export default {
+		props: ['info'],
 		data() {
-			return {
-				
-			}
+			return {}
 		},
 		methods: {
-			
+
 		}
 	}
 </script>
 
-<style>
+<style lang="less" scoped>
+	.Box {
+		width: 750rpx;
+		background: #FFFFFF;
+		border-radius: 16rpx 16rpx 16rpx 16rpx;
+		padding: 32rpx 64rpx;
+		margin-top: 32rpx;
+		position: relative;
 
-</style>
+		.fontStyle {
+			.df;
+
+			>text {
+				font-weight: 500;
+				font-size: 28rpx;
+				color: #333333;
+				margin-left: 12rpx
+			}
+		}
+
+		.content {
+			.df(flex-start, stretch);
+			margin-top: 16rpx;
+			margin-left: 20rpx;
+
+			>view {
+				>text {
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #666666;
+				}
+
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #666666;
+				margin-right: 50rpx;
+				width: 120rpx;
+				.df(space-between)
+			}
+
+			>text {
+
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #333333;
+
+			}
+
+		}
+
+
+
+
+
+
+
+
+
+
+
+	}
+
+	.ml-20 {
+		margin-left: 20rpx;
+	}
+
+	.df(@start: flex-start, @position: center) {
+		display: flex;
+		justify-content: @start;
+		align-items: @position;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/group_order/components/groupPrompt.vue b/pages/group_order/components/groupPrompt.vue
index ffda636..ba5eb82 100644
--- a/pages/group_order/components/groupPrompt.vue
+++ b/pages/group_order/components/groupPrompt.vue
@@ -1,22 +1,152 @@
 <template>
-	<view>
-		5
+	<view class="Box">
+		<view class="fontStyle">
+			<image src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/dengpao.png"
+				style="width: 33.19rpx;height: 43.92rpx;" mode=""></image>
+			<text>温馨提示</text>
+		</view>
+		<view class="content">
+			<view>
+				有效期:
+			</view>
+			<text>{{info.notice.dateUsed}}</text>
+		</view>
+		<view class="content">
+			<view>
+				使用时间:
+			</view>
+			<text>{{info.notice.availableTime}}</text>
+		</view>
+		<view class="content">
+			<view>
+				使用规则:
+			</view>
+			<text>{{info.notice.invoiceInfo}}</text>
+		</view>
+		<view @click="clickEvent" class="lookstyle" v-if="islook">
+			查看更多<u-icon name="arrow-down" color="#575B66" size="28"></u-icon>
+		</view>
+		<view class="More" v-else>
+			{{info.notice.usageRules}}
+		</view>
+
+
+
 	</view>
 </template>
 
 <script>
 	export default {
+		props: ['info'],
 		data() {
 			return {
-				
+				islook: true
 			}
 		},
 		methods: {
-			
+			clickEvent() {
+				this.islook = false
+			}
 		}
 	}
 </script>
 
-<style>
+<style lang="less" scoped>
+	.Box {
+		width: 750rpx;
+		background: #FFFFFF;
+		border-radius: 16rpx 16rpx 16rpx 16rpx;
+		padding: 32rpx 64rpx;
+		margin-top: 32rpx;
+		position: relative;
 
-</style>
+		.fontStyle {
+			.df;
+
+			>text {
+				font-weight: 500;
+				font-size: 28rpx;
+				color: #333333;
+				margin-left: 12rpx
+			}
+		}
+
+		.content {
+			.df(flex-start, stretch);
+			margin-top: 16rpx;
+
+			>view {
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #999999;
+				width: 120rpx;
+			}
+
+			>text {
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #666666;
+			}
+
+		}
+
+		.More {
+			margin-left: 119rpx;
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #666666;
+		}
+
+
+		.buttonStyle {
+			width: 158rpx;
+			height: 56rpx;
+			background: #FFFFFF;
+			border-radius: 10rpx 10rpx 10rpx 10rpx;
+			border: 2rpx solid #E8E8E8;
+			position: absolute;
+			right: 58rpx;
+			top: 56rpx;
+		}
+
+		.addreeStyle {
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #999999;
+			margin-top: 22rpx;
+			.df;
+		}
+
+		.rightStyle {
+			margin-top: 16rpx;
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #333;
+			.df(space-between);
+
+			>view>text {
+				margin-left: 8rpx;
+				color: #999999;
+				font-size: 24rpx;
+			}
+		}
+
+		.lookstyle {
+			width: 100%;
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #333333;
+			.df(center);
+		}
+	}
+
+	.ml-20 {
+		margin-left: 20rpx;
+	}
+
+	.df(@start: flex-start, @position: center) {
+		display: flex;
+		justify-content: @start;
+		align-items: @position;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/group_order/components/groupStore.vue b/pages/group_order/components/groupStore.vue
index e7c1f76..62f4a96 100644
--- a/pages/group_order/components/groupStore.vue
+++ b/pages/group_order/components/groupStore.vue
@@ -1,22 +1,110 @@
 <template>
-	<view>
-		4
+	<view class="Box">
+		<view class="fontStyle">
+			<image src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/canyin.png"
+				style="width: 40rpx;height: 36.44rpx;" mode=""></image>
+			<text>到店吃套餐</text>
+		</view>
+		<view   v-for="(item ,i ) in info.tagVos" :key="i">
+			<view class="content">
+				{{item.title}} {{item.goods.length}} 选 {{item.number}}
+			</view>
+			<view class="rightStyle" v-for="(ele,index) in item.goods" :key="index">
+				<view>
+					{{ele.name}} <text>({{ele.unitName}})</text>
+				</view>
+				<text>￥{{ele.lowPrice}}</text>
+			</view>
+		</view>
 	</view>
 </template>
 
 <script>
 	export default {
+		props: ['info'],
 		data() {
 			return {
-				
+
 			}
 		},
 		methods: {
-			
+			makephone(e) {
+				uni.makePhoneCall({
+					phoneNumber: e
+				});
+			}
 		}
 	}
 </script>
 
-<style>
+<style lang="less" scoped>
+	.Box {
+		width: 750rpx;
+		background: #FFFFFF;
+		border-radius: 16rpx 16rpx 16rpx 16rpx;
+		padding: 32rpx 64rpx;
+		margin-top: 32rpx;
+		position: relative;
 
-</style>
+		.fontStyle {
+			.df;
+
+			>text {
+				font-weight: 500;
+				font-size: 28rpx;
+				color: #333333;
+				margin-left: 12rpx
+			}
+		}
+
+		.content {
+			margin-top: 20rpx;
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #999999;
+		}
+
+		.buttonStyle {
+			width: 158rpx;
+			height: 56rpx;
+			background: #FFFFFF;
+			border-radius: 10rpx 10rpx 10rpx 10rpx;
+			border: 2rpx solid #E8E8E8;
+			position: absolute;
+			right: 58rpx;
+			top: 56rpx;
+		}
+
+		.addreeStyle {
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #999999;
+			margin-top: 22rpx;
+			.df;
+		}
+
+		.rightStyle {
+			margin-top: 16rpx;
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #333;
+			.df(space-between);
+
+			>view>text {
+				margin-left: 8rpx;
+				color: #999999;
+				font-size: 24rpx;
+			}
+		}
+	}
+
+	.ml-20 {
+		margin-left: 20rpx;
+	}
+
+	.df(@start: flex-start, @position: center) {
+		display: flex;
+		justify-content: @start;
+		align-items: @position;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/group_order/components/groupTitle.vue b/pages/group_order/components/groupTitle.vue
index 1fbba54..271a565 100644
--- a/pages/group_order/components/groupTitle.vue
+++ b/pages/group_order/components/groupTitle.vue
@@ -1,22 +1,82 @@
 <template>
-	<view>
-		1
+	<view class="title">
+		<text class="fontStyle">{{info.proName}}</text>
+		<view class="titleBox">
+			<image :src="info.proImg" mode="" style="width: 102rpx;height: 102rpx;border-radius: 12rpx 12rpx 12rpx 12rpx;"></image>
+			<view class="ml-20 rightText">
+				<view >
+					{{info.avaTime}}
+				</view>
+				<view style="margin-top: 8rpx;">{{info.proDetail}}</view>
+			</view>
+		</view>
+		<view class="moneyStyle">
+			<text class="moneys">￥{{info.orderAmount}}</text>
+			<u-icon name="arrow-right" color="#000" size="28"></u-icon>
+		</view>
 	</view>
 </template>
 
 <script>
 	export default {
+		props: ['info'],
 		data() {
 			return {
-				
+
 			}
 		},
 		methods: {
-			
+
 		}
 	}
 </script>
 
-<style>
+<style lang="less">
+	.title {
+		width: 750rpx;
+		height: 206rpx;
+		background: #FFFFFF;
+		border-radius: 16rpx 16rpx 16rpx 16rpx;
+		padding: 32rpx 64rpx;
+		margin-top: 32rpx;
+		position: relative;
 
-</style>
+		.fontStyle {
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #333333;
+		}
+
+		.titleBox {
+			.df();
+
+			.rightText {
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #999999;
+			}
+		}
+
+		.moneyStyle {
+			position: absolute;
+			right: 30rpx;
+			top: 80rpx;
+			.df();
+			.moneys{
+				font-weight: bold;
+				font-size: 32rpx;
+				color: #333333;
+			}
+		}
+	}
+
+	.ml-20 {
+		margin-left: 20rpx;
+	}
+
+	.df(@start: flex-start, @position: center) {
+		display: flex;
+		justify-content: @start;
+		align-items: @position;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/group_order/order_groupdetail.vue b/pages/group_order/order_groupdetail.vue
index 8b36865..a349125 100644
--- a/pages/group_order/order_groupdetail.vue
+++ b/pages/group_order/order_groupdetail.vue
@@ -2,27 +2,57 @@
 	<!-- 团购订单详情 -->
 	<view>
 		<!-- 头部 -->
-		<groupTitle></groupTitle>
-		<!-- 券 -->
-		<groupCoupons></groupCoupons>
+		<groupTitle :info="listinfo"></groupTitle>
+		<!-- 券 
+		if (e == 'closed') return '已完成'
+				else if (e == 'unpaid') return '待付款'
+				else if (e == 'unused') return '待使用'
+				else if (e == 'refund') return '已退款'
+				else if (e == 'cancelled') return '已取消'
+				else return "1"
+				-->
+		<groupCoupons :info="listinfo" @clickEvent='clickEvent'
+			v-if="listinfo.status=='unused'||listinfo.status=='refund'"></groupCoupons>
 		<!-- 商家信息 -->
-		<groupMerchants></groupMerchants>
+		<groupMerchants :info="listinfo"></groupMerchants>
 		<!-- 到店 -->
-		<groupStore></groupStore>
+		<groupStore :info="listinfo"></groupStore>
 		<!-- 提示 -->
-		<groupPrompt></groupPrompt>
+		<groupPrompt :info="listinfo"></groupPrompt>
 		<!-- 实付 -->
-		<groupPay></groupPay>
+		<groupPay :info="listinfo" v-if="listinfo.status=='unused'||listinfo.status=='refund'"></groupPay>
+		<!-- 订单信息 -->
+		<groupOrderInfo :info="listinfo" v-else></groupOrderInfo>
+		<view class="customerService" @click="makephone(listinfo.phone)">
+			<image src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/kefu.png"
+				style="width: 40rpx;height: 43.21rpx;" mode=""></image>
+			联系客服
+		</view>
+		<!-- 待支付按钮 -->
+		<button v-if="listinfo.status == 'unpaid'" @click="payEvent" class="payStyle">立即支付</button>
+		<!-- 二维码展示 -->
+		<view class="qrimg" v-if="isQrimg" @click="clickEvent">
+			<tki-qrcode ref="qrcode" size="400" :val="qrValue" :loadMake="true" @result="qrR" />
+		</view>
 	</view>
 </template>
 
 <script>
+	/** 
+	 * 只有两个有变动，美团券和实付金额、订单信息
+	 * 1.支付完成/已退款/有美团券、
+	 * 待支付/已完成没有美团券
+	 * 2.支付完成、已退款有实付金额
+	 * 待支付、已完成有订单信息没有实付金额
+	 **/
 	import groupTitle from './components/groupTitle.vue'
 	import groupCoupons from './components/groupCoupons.vue'
 	import groupMerchants from './components/groupMerchants.vue'
 	import groupStore from './components/groupStore.vue'
 	import groupPrompt from './components/groupPrompt.vue'
 	import groupPay from './components/groupPay.vue'
+	import groupOrderInfo from './components/groupOrderInfo.vue'
+	import tkiQrcode from "@/components/tki-qrcode/tki-qrcode.vue"
 	export default {
 		components: {
 			groupTitle,
@@ -30,7 +60,9 @@
 			groupMerchants,
 			groupStore,
 			groupPrompt,
-			groupPay
+			groupPay,
+			tkiQrcode,
+			groupOrderInfo
 		},
 		onLoad(e) {
 			this.orderId = e.orderId
@@ -39,36 +71,126 @@
 		data() {
 			return {
 				orderId: "",
-				listinfo: null
+				listinfo: null,
+				isQrimg: false,
+				qrValue: ""
 			}
 		},
 		methods: {
+			async payEvent() {
+				console.log('调试1')
+				let res = await this.api.payOrderPay({
+					payType:'wechatPay',
+					orderId:this.listinfo.id,  
+				})
+				console.log('调试2')
+				if (res) {
+					return
+					uni.requestPayment({
+						provider: 'wxpay', //支付类型-固定值
+						partnerid: res.data.payAppId, // 微信支付商户号
+						timeStamp: res.data.payTimeStamp, // 时间戳（单位：秒）
+						nonceStr: res.data.paynonceStr, // 随机字符串
+						package: res.data.payPackage, // 固定值
+						signType: res.data.paySignType, //固定值
+						paySign: res.data.paySign, //签名
+						success: (res) => {
+							uni.showToast({
+								title: "支付成功"
+							})
+							uni.navigateBack()
+						},
+						fail: (err) => {
+							setTimeout(res => {
+								uni.showToast({
+									icon: 'none',
+									title: '支付失败'
+								})
+								uni.hideLoading()
+							}, 2000)
+						}
+					});
+				}
+			},
+			clickEvent() {
+				this.qrValue = this.qrEvent()
+				this.isQrimg = !this.isQrimg
+			},
+			qrR(e) {
+				console.log(112312)
+			},
+			// 拼接code值
+			qrEvent() {
+				let str = ''
+				this.listinfo.coupons.forEach(res => {
+					if (res.couponNo) {
+						str += res.couponNo + ','
+					}
+				})
+				return str
+			},
 			orderorderInfo() {
 				let _this = this
 				uni.getStorage({
 					key: "getLocationstorage",
-					success: function(data) {
+					success: async function(data) {
 						let {
 							lat,
 							lng
 						} = data.data
-						let res = _this.api.groupOrderInfoDetail({
+						let res = await _this.api.groupOrderInfoDetail({
 							id: _this.orderId,
 							lat,
 							lng
 						})
 						if (res.code == 0) {
 							_this.listinfo = res.data
-							// this.mountedcreateSelectorQuery()
 						}
 					}
 				});
 
 			},
+			makephone(e) {
+				uni.makePhoneCall({
+					phoneNumber: e
+				});
+			}
 		}
 	}
 </script>
 
-<style>
+<style lang="less" scoped>
+	.qrimg {
+		width: 55vh;
+		height: 100vh;
+		background-color: rgba(0, 0, 0, .6);
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		position: fixed;
+		top: 0%;
+		left: 0%;
+	}
 
+	.payStyle {
+		background-color: #fe7620;
+		position: fixed;
+		bottom: 0%;
+		left: 50%;
+		transform: translate(-50%);
+		color: #fff;
+		width: 90%;
+		border: 10rpx solid #fff;
+	}
+
+	.customerService {
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #333333;
+		width: 100%;
+		padding: 78rpx 0;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/order/order.vue b/pages/order/order.vue
index 1eabb4a..e6380dc 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -107,8 +107,10 @@
 						<view>实付：<text style="color: #FF4C11;">￥{{item.payAmount}}</text></view>
 					</view>
 				</view>
-				<u-button v-if="item.status=='unused'" type="primary" shape="circle" class="buttonStyle"
-					text="查看券码"></u-button>
+				<button v-if="item.status=='unused'" type="primary"  class="buttonStyle"
+					>查看券码</button>
+					<button v-if="item.status=='unpaid'" type="primary"  class="buttonStyle"
+						>去付款</button>
 			</view>
 		</view>
 		<image style="margin:32rpx auto;" src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/nomore.png"
@@ -514,11 +516,13 @@
 				position: absolute;
 				right: 20rpx;
 				bottom: 50rpx;
+				font-size: 28rpx;
 				width: 170rpx;
 				height: 64rpx;
 				background: #FFD100;
 				border-radius: 32rpx 32rpx 32rpx 32rpx;
 				border: none;
+				color: #000;
 			}
 
 			.state {