1-9

api/user.js

@@ -743,4 +743,8 @@ export function transferInfoApi(data) {
 //tradeMoney
 export function tradeMoney(data) {
 	return request.post(`recharge/trade_money`, data);
+}
+
+export function setTrade(data) {
+	return request.post('user/trade', data);
 }

components/orderGoods/index.vue

@@ -62,10 +62,10 @@
 					<view class='logistics' v-if="item.is_reply==0 && evaluate==3 && pid != -1 && isShow"
 						@click.stop="evaluateTap(item.unique,orderId)">
 						{{$t(`评价`)}}</view>
-					<view class='logistics'
+					<!-- <view class='logistics'
 						v-if="paid === 1 && refund_status === 0 && item.refund_num !=item.cart_num && !is_confirm && is_refund_available && isShow && (virtualType == 0 || (virtualType > 0 && statusType == 1)) && (is_gift != 2) && gift_uid == 0"
 						@click.stop="openSubcribe(item)">
-						{{$t(`申请退款`)}}</view>
+						{{$t(`申请退款`)}}</view> -->
 					<view class="rig-btn" v-if="status_type === 2 && index === cartInfo.length - 1 || !split">
 						<view v-if="delivery_type === 'express'" class="logistics" @click.stop="logistics(orderId)">{{$t(`查看物流`)}}
 						</view>

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

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>

config/app.js

@@ -2,7 +2,7 @@ module.exports = {
 	// 小程序 / APP请求配置
 	// #ifdef MP || APP-PLUS
 	// 请求域名 格式： https://您的域名
-	HTTP_REQUEST_URL: `https://zyxs.qiniu1314.com`,
+	HTTP_REQUEST_URL: `https://zibao.qiniu1314.com`,
 	// #endif
 
 	// H5请求配置

pages.json

@@ -644,7 +644,7 @@
 				{
 					"path": "user_integral/guquan",
 					"style": {
-						"navigationBarTitleText": "股权详情"
+						"navigationBarTitleText": "复购次数"
 							// #ifdef MP
 							,
 						"navigationBarTextStyle": "black",
@@ -857,6 +857,19 @@
 						}
 					}
 				},
+				{
+					"path": "user_payment/indexss",
+					"style": {
+						"navigationBarTitleText": "余额转账",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
 				{
 					"path": "user_payment/indexs",
 					"style": {
@@ -890,6 +903,26 @@
 						}
 					}
 				},
+				{
+					"path": "user_pwd_edit/indexs",
+					"style": {
+						"navigationBarTitleText": "修改交易密码"
+				
+							// #ifdef MP
+							// 	,
+							// "navigationBarTextStyle": "white"
+							// "navigationBarBackgroundColor": "#e93323"
+							// #endif
+							,
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
 				{
 					"path": "promoter-list/index",
 					"style": {

pages/goods/goods_return_list/index.vue

@@ -2,7 +2,7 @@
 	<view :style="colorStyle">
 		<view class='apply-return'>
 			<splitOrder :splitGoods="returnGoodsList" @getList="getCheckList" :select_all="false"></splitOrder>
-			<button class='returnBnt bg-color' @click="subRefund">{{$t(`申请退款`)}}</button>
+			<!-- <button class='returnBnt bg-color' @click="subRefund">{{$t(`申请退款`)}}</button> -->
 		</view>
 	</view>
 </template>

pages/goods/order_details/index.vue

@@ -471,13 +471,13 @@
 						{{ $t(`取消订单`) }}
 					</view>
 					<view class="bnt bg-color" v-if="status.type == 0" @tap="pay_open(orderInfo.order_id)">{{ $t(`立即付款`) }}</view>
-					<view
+					<!-- <view
 						@click="openSubcribe(`/pages/goods/${cartInfo.length > 1 ? 'goods_return_list' : 'goods_return'}/index?orderId=` + orderInfo.order_id + '&id=' + orderInfo.id)"
 						class="bnt cancel"
 						v-else-if="orderInfo.is_apply_refund && orderInfo.refund_status == 0 && cartInfo.length > 1 && !orderInfo.virtual_type && orderInfo.is_refund_available"
 					>
 						{{ cartInfo.length > 1 ? $t(`批量退款`) : $t(`申请退款`) }}
-					</view>
+					</view> -->
 					<navigator
 						class="bnt cancel"
 						v-if="orderInfo.delivery_type == 'express' && status.class_status == 3 && status.type == 2 && !split.length"

pages/goods_details/index.vue

@@ -637,6 +637,7 @@ export default {
 			returnShow: true, //判断顶部返回是否出现
 			diff: '',
 			is_money_level: 1,
+			level: 0,
 			is_vip: 0, //是否是会员
 			navbarRight: 0,
 			homeTop: 20,
@@ -967,6 +968,7 @@ export default {
 			let that = this;
 			getUserInfo().then((res) => {
 				that.$set(that, 'uid', res.data.uid);
+				that.$set(that, 'level', res.data.agent_level);
 				that.$set(that, 'is_money_level', res.data.is_money_level);
 			});
 		},
@@ -1483,6 +1485,12 @@ export default {
 				uniqueId: that.attr.productSelect !== undefined ? that.attr.productSelect.unique : '',
 				virtual_type: that.storeInfo.virtual_type
 			};
+			if(that.storeInfo.min_level && ((that.storeInfo.min_level > that.level) || (that.storeInfo.min_level == 1 && that.level != 1))) {
+					that.$util.Tips({
+						title: that.$t(`您当前等级无法购买该商品`)
+					});
+					return 
+			}
 			postCartAdd(q)
 				.then((res) => {
 					that.isOpen = false;

pages/user/index.vue

@@ -66,6 +66,9 @@
 								<view class="num" v-if="userInfo.phone" @click="goEdit()">
 									<view class="num-txt">{{ userInfo.phone }}</view>
 								</view>
+								<view class="num" v-if="userInfo.uid" @click="goEdit()">
+									<view class="num-txt" style="font-size: 32rpx;">ID: {{ userInfo.uid }}</view>
+								</view>
 								<!-- #ifdef MP -->
 								<button class="phone" v-if="!userInfo.phone && isLogin" open-type="getPhoneNumber" @getphonenumber="getphonenumber">{{ $t(`绑定手机号`) }}</button>
 								<!-- #endif -->
@@ -99,7 +102,7 @@
 							</view>
 							<view class="num-item" @click="goMenuPage('/pages/users/user_integral/guquan')">
 								<text class="num">{{ userInfo.share || 0 }}</text>
-								<view class="txt">{{ $t('股权') }}</view>
+								<view class="txt">{{ $t('复购次数') }}</view>
 							</view>
 							<!-- <view class="num-item" @click="goMenuPage('/pages/users/user_coupon/index')">
 								<text class="num">{{ userInfo.couponCount || 0 }}</text>
@@ -342,11 +345,11 @@ export default {
 					title: '待评价',
 					url: '/pages/goods/order_list/index?status=3'
 				},
-				{
-					img: 'icon-a-shouhoutuikuan',
-					title: '售后/退款',
-					url: '/pages/users/user_return_list/index'
-				}
+				// {
+				// 	img: 'icon-a-shouhoutuikuan',
+				// 	title: '售后/退款',
+				// 	url: '/pages/users/user_return_list/index'
+				// }
 			],
 			imgUrls: [],
 			autoplay: true,

pages/users/promoter-list/index.vue

@@ -7,6 +7,10 @@
 						<view class='name'>{{$t(`推广人数`)}}</view>
 						<view><text class='num'>{{teamCount}}</text>{{$t('人')}}</view>
 					</view>
+					<view>
+						<view class='name'>{{$t(`团队业绩`)}}</view>
+						<view><text class='num'>{{userInfo.performance || '0.00'}}</text></view>
+					</view>
 					<view class='iconfont icon-tuandui'></view>
 				</view>
 			</view>
@@ -71,6 +75,7 @@
 							</view>
 							<view><text class="num">{{item.orderCount ? item.orderCount : 0}}</text>{{$t(`单`)}}</view>
 							<view><text class="num">{{item.numberCount ? item.numberCount : 0}}</text>{{$t(`元`)}}</view>
+							<view><text class="num">团队业绩：{{item.performance ? item.performance : 0}}</text>{{$t(`元`)}}</view>
 						</view>
 					</view>
 				</block>
@@ -92,6 +97,9 @@
 </template>
 
 <script>
+	import {
+		getUserInfo
+	} from '@/api/user.js';
 	import {
 		spreadPeople
 	} from '@/api/user.js';
@@ -119,6 +127,7 @@
 		mixins: [colors],
 		data() {
 			return {
+				userInfo: {},
 				imgHost: HTTP_REQUEST_URL,
 				total: 0,
 				totalLevel: 0,
@@ -145,12 +154,19 @@
 			}
 		},
 		onShow: function() {
+			this.getUserInfo()
 			// if (this.is_show) this.userSpreadNewList();
 		},
 		onHide: function() {
 			this.is_show = true;
 		},
 		methods: {
+			getUserInfo: function() {
+				let that = this;
+				getUserInfo().then(res => {
+					that.$set(that, 'userInfo', res.data);
+				});
+			},
 			onLoadFun: function(e) {
 				this.userSpreadNewList();
 			},

pages/users/user_bill/index.vue

@@ -13,7 +13,7 @@
 						<view class='listn'>
 							<view class='itemn acea-row row-between-wrapper' v-for="(vo,indexn) in item.child" :key="indexn">
 								<view>
-									<view class='name line1'>{{$t(vo.title)}}</view>
+									<view class='name'>{{$t(vo.mark) || $t(vo.title)}}</view>
 									<view>{{vo.add_time}}</view>
 								</view>
 								<view class='num' v-if="vo.pm">+{{vo.number}}</view>

pages/users/user_cash/index.vue

@@ -9,23 +9,25 @@
 				</view>
 			</view>
 			<view class='wrapper'>
+
 				<view :hidden='currentTab != 0' class='list'>
 					<form @submit="subCash">
 						<view class='item acea-row row-between-wrapper'>
 							<view class='name'><text class='red'>*</text> {{$t(`持卡人`)}}</view>
 							<view class='input'><input :placeholder='$t(`请输入持卡人姓名`)' placeholder-class='placeholder'
-									name="name"></input></view>
+									v-model="bank.name" name="name"></input></view>
 						</view>
 						<view class='item acea-row row-between-wrapper'>
 							<view class='name'><text class='red'>*</text> {{$t(`卡号`)}}</view>
-							<view class='input'><input type='number' :placeholder='$t(`请填写卡号`)' placeholder-class='placeholder'
-									name="cardnum"></input></view>
+							<view class='input'><input type='number' :placeholder='$t(`请填写卡号`)'
+									placeholder-class='placeholder' v-model="bank.cardnum" name="cardnum"></input>
+							</view>
 						</view>
 						<view class='item acea-row row-between-wrapper'>
 							<view class='name'><text class='red'>*</text> {{$t(`银行`)}}</view>
 							<view class='input'>
-								<picker @change="bindPickerChange" :value="index" :range="array">
-									<text class='Bank'>{{array[index]}}</text>
+								<picker @change="bindPickerChange" :value="bank.index" :range="array">
+									<text class='Bank'>{{bank.bankname || array[bank.index]}}</text>
 									<text class='iconfont icon-qiepian38'></text>
 								</picker>
 							</view>
@@ -35,8 +37,14 @@
 							<view class='input'><input @input='inputNum' :placeholder='$t(`最低提现金额`)+minPrice'
 									placeholder-class='placeholder' name="money" type='digit'></input></view>
 						</view>
+						<view class='item acea-row row-between-wrapper'>
+							<view class='name'><text class='red'>*</text> {{$t(`交易密码`)}}</view>
+							<view class='input'><input :placeholder='$t(`请填写交易密码`)' placeholder-class='placeholder'
+									name="trade" type='password'></input></view>
+						</view>
 						<view class='tip'>
-							{{$t(`当前可提现金额`)}}: <text class="price">{{$t(`￥`)}}{{userInfo.commissionCount}}</text>，{{$t(`冻结佣金`)}}:
+							{{$t(`当前可提现金额`)}}: <text
+								class="price">{{$t(`￥`)}}{{userInfo.commissionCount}}</text>，{{$t(`冻结佣金`)}}:
 							{{$t(`￥`)}}{{userInfo.broken_commission}}
 						</view>
 						<view class='tip'>
@@ -54,18 +62,21 @@
 						<view class='item acea-row row-between-wrapper'>
 							<view class='name'><text class='red'>*</text> {{$t(`姓名`)}}</view>
 							<view class='input'><input :placeholder='$t(`请填写您的真实姓名`)' placeholder-class='placeholder'
-									name="user_name"></input></view>
+									v-model="weixin.user_name" name="user_name"></input></view>
 						</view>
 						<view class='item acea-row row-between-wrapper' v-if="!weixinExtractType">
 							<view class='name'><text class='red'>*</text> {{$t(`账号`)}}</view>
 							<view class='input'><input :placeholder='$t(`请填写您的微信账号`)' placeholder-class='placeholder'
-									name="name"></input></view>
+									v-model="weixin.name" name="name"></input></view>
 						</view>
+
 						<view class='item acea-row row-between-wrapper'>
 							<view class='name'><text class='red'>*</text> {{$t(`提现`)}}</view>
-							<view class='input'><input @input='inputNum' :placeholder='$t(`提现最低`)+minPrice+$t(`元，最高500元`)'
-									placeholder-class='placeholder' name="money" type='digit'></input></view>
+							<view class='input'><input @input='inputNum'
+									:placeholder='$t(`提现最低`)+minPrice+$t(`元，最高500元`)' placeholder-class='placeholder'
+									name="money" type='digit'></input></view>
 						</view>
+
 						<view class='item acea-row row-top row-between' v-if="!weixinExtractType">
 							<view class='name pos'>{{$t(`收款码`)}}</view>
 							<view class="input acea-row">
@@ -73,14 +84,21 @@
 									<image :src="qrcodeUrlW"></image>
 									<text class='iconfont icon-guanbi1 fontcolor' @click='DelPicW'></text>
 								</view>
-								<view class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic("W")' v-else>
+								<view class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic("W")'
+									v-else>
 									<text class='iconfont icon-icon25201'></text>
 									<view>{{$t(`上传图片`)}}</view>
 								</view>
 							</view>
 						</view>
+						<view class='item acea-row row-between-wrapper'>
+							<view class='name'><text class='red'>*</text> {{$t(`交易密码`)}}</view>
+							<view class='input'><input :placeholder='$t(`请填写交易密码`)' placeholder-class='placeholder'
+									name="trade" type='password'></input></view>
+						</view>
 						<view class='tip'>
-							{{$t(`当前可提现金额`)}}: <text class="price">{{$t(`￥`)}}{{userInfo.commissionCount}}</text>，{{$t(`冻结佣金`)}}:
+							{{$t(`当前可提现金额`)}}: <text
+								class="price">{{$t(`￥`)}}{{userInfo.commissionCount}}</text>，{{$t(`冻结佣金`)}}:
 							{{$t(`￥`)}}{{userInfo.broken_commission}}
 						</view>
 						<view class='tip'>
@@ -98,13 +116,15 @@
 						<view class='item acea-row row-between-wrapper'>
 							<view class='name'><text class='red'>*</text> {{$t(`账号`)}}</view>
 							<view class='input'><input :placeholder='$t(`请填写您的支付宝账号`)' placeholder-class='placeholder'
-									name="name"></input></view>
+									v-model="alipay.name" name="name"></input></view>
 						</view>
 						<view class='item acea-row row-between-wrapper'>
 							<view class='name'><text class='red'>*</text> {{$t(`姓名`)}}</view>
-							<view class='input'><input :placeholder='$t(`请填写支付宝绑定的真实姓名`)' placeholder-class='placeholder'
-									name="user_name"></input></view>
+							<view class='input'><input :placeholder='$t(`请填写支付宝绑定的真实姓名`)'
+									placeholder-class='placeholder' v-model="alipay.user_name" name="user_name"></input>
+							</view>
 						</view>
+
 						<view class='item acea-row row-between-wrapper'>
 							<view class='name'><text class='red'>*</text> {{$t(`提现`)}}</view>
 							<view class='input'><input @input='inputNum' :placeholder='$t(`最低提现金额`)+minPrice'
@@ -117,14 +137,21 @@
 									<image :src="qrcodeUrlZ"></image>
 									<text class='iconfont icon-guanbi1 fontcolor' @click='DelPicZ'></text>
 								</view>
-								<view class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic("Z")' v-else>
+								<view class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic("Z")'
+									v-else>
 									<text class='iconfont icon-icon25201'></text>
 									<view>{{$t(`上传图片`)}}</view>
 								</view>
 							</view>
 						</view>
+						<view class='item acea-row row-between-wrapper'>
+							<view class='name'><text class='red'>*</text> {{$t(`交易密码`)}}</view>
+							<view class='input'><input :placeholder='$t(`请填写交易密码`)' placeholder-class='placeholder'
+									name="trade" type='password'></input></view>
+						</view>
 						<view class='tip'>
-							{{$t(`当前可提现金额`)}}: <text class="price">{{$t(`￥`)}}{{userInfo.commissionCount}}</text>，{{$t(`冻结佣金`)}}:
+							{{$t(`当前可提现金额`)}}: <text
+								class="price">{{$t(`￥`)}}{{userInfo.commissionCount}}</text>，{{$t(`冻结佣金`)}}:
 							{{$t(`￥`)}}{{userInfo.broken_commission}}
 						</view>
 						<view class='tip'>
@@ -141,11 +168,17 @@
 					<form @submit="importNowMoney">
 						<view class='item acea-row row-between-wrapper'>
 							<view class='name'><text class='red'>*</text> {{$t(`提现`)}}</view>
-							<view class='input'><input @input='inputNum' placeholder='请输入提现金额' placeholder-class='placeholder'
-									name="money" type='digit'></input></view>
+							<view class='input'><input @input='inputNum' placeholder='请输入提现金额'
+									placeholder-class='placeholder' name="money" type='digit'></input></view>
+						</view>
+						<view class='item acea-row row-between-wrapper'>
+							<view class='name'><text class='red'>*</text> {{$t(`交易密码`)}}</view>
+							<view class='input'><input :placeholder='$t(`请填写交易密码`)' placeholder-class='placeholder'
+									name="trade" type='password'></input></view>
 						</view>
 						<view class='tip'>
-							{{$t(`当前可提现金额`)}}: <text class="price">{{$t(`￥`)}}{{userInfo.commissionCount}}</text>，{{$t(`冻结佣金`)}}:
+							{{$t(`当前可提现金额`)}}: <text
+								class="price">{{$t(`￥`)}}{{userInfo.commissionCount}}</text>，{{$t(`冻结佣金`)}}:
 							{{$t(`￥`)}}{{userInfo.broken_commission}}
 						</view>
 						<button formType="submit" class='bnt bg-color'>{{$t(`提现`)}}</button>
@@ -188,6 +221,23 @@
 		mixins: [colors],
 		data() {
 			return {
+				extract_type: 'bank',
+				bank: {
+					name: '',
+					cardnum: '',
+					bankname: '',
+					index: 0
+				},
+				weixin: {
+					user_name: '',
+					name: '',
+					qrcode_url: ''
+				},
+				alipay: {
+					user_name: '',
+					name: '',
+					qrcode_url: ''
+				},
 				navList: [],
 				currentTab: 0,
 				index: 0,
@@ -225,6 +275,20 @@
 			} else {
 				toLogin();
 			}
+			let bank = uni.getStorageSync('bank')
+			let weixin = uni.getStorageSync('weixin')
+			let alipay = uni.getStorageSync('alipay')
+			if(bank && bank.name) {
+				this.bank = bank
+			}
+			if(weixin && weixin.name) {
+				this.weixin = weixin
+				this.qrcodeUrlW = this.weixin.qrcode_url || ''
+			}
+			if(alipay && alipay.name) {
+				this.alipay = alipay
+				this.qrcodeUrlZ = this.alipay.qrcode_url || ''
+			}
 		},
 		methods: {
 			inputNum: function(e) {
@@ -287,8 +351,10 @@
 					that.$set(that, 'array', array);
 					that.minPrice = res.data.minPrice;
 					that.withdrawal_fee = res.data.withdrawal_fee;
-					that.alipayExtractType = res.data.alipayExtractType ? parseInt(res.data.alipayExtractType) : 0;
-					that.weixinExtractType = res.data.weixinExtractType ? parseInt(res.data.weixinExtractType) : 0;
+					that.alipayExtractType = res.data.alipayExtractType ? parseInt(res.data
+						.alipayExtractType) : 0;
+					that.weixinExtractType = res.data.weixinExtractType ? parseInt(res.data
+						.weixinExtractType) : 0;
 				});
 			},
 			/**
@@ -333,7 +399,9 @@
 				this.currentTab = current;
 			},
 			bindPickerChange: function(e) {
+				this.bank.index = e.detail.value;
 				this.index = e.detail.value;
+				this.bank.bankname = this.array[e.detail.value];
 			},
 			subCash(e) {
 				let that = this,
@@ -349,6 +417,7 @@
 					if (that.index == 0) return this.$util.Tips({
 						title: this.$t(`请选择银行`)
 					});
+					value.index = that.index
 					value.extract_type = 'bank';
 					value.bankname = that.array[that.index];
 				} else if (that.currentTab == 1) { //微信
@@ -361,9 +430,12 @@
 					if (!that.weixinExtractType && !value.name.trim()) return this.$util.Tips({
 						title: this.$t(`请填写微信号`)
 					});
+					if (Number(value.money) > 500) return this.$util.Tips({
+						title: this.$t(`提现金额不能高于500`)
+					});
 					value.weixin = value.name;
 					value.qrcode_url = that.qrcodeUrlW;
-					
+
 				} else if (that.currentTab == 2) { //支付宝
 					value.extract_type = 'alipay';
 					if (value.name.length == 0) return this.$util.Tips({
@@ -378,15 +450,17 @@
 				if (Number(value.money) < Number(that.minPrice)) return this.$util.Tips({
 					title: this.$t(`提现金额不能低于`) + that.minPrice
 				});
-				if (Number(value.money) > 500) return this.$util.Tips({
-					title: this.$t(`提现金额不能高于500`)
+
+				if (!value.trade) return this.$util.Tips({
+					title: this.$t(`请填写交易密码`)
 				});
 				this.prevent = true
 				extractCash(value).then(res => {
+					uni.setStorageSync(value.extract_type, value)
 					that.getUserInfo();
-					if(this.weixinExtractType == 1 && this.currentTab == 1){
+					if (this.weixinExtractType == 1 && this.currentTab == 1) {
 						// #ifdef MP
-							this.openSubscribe('/pages/users/user_spread_user/index')
+						this.openSubscribe('/pages/users/user_spread_user/index')
 						// #endif
 						return
 					}
@@ -432,6 +506,11 @@
 						title: that.$t(`请输入金额`)
 					});
 				}
+				if (!e.detail.value.trade) {
+					return that.$util.Tips({
+						title: that.$t(`请输入交易密码`)
+					});
+				}
 				uni.showModal({
 					title: that.$t(`提现到余额`),
 					content: that.$t(`提现到余额后无法再次转出，确认是否提现到余额`),
@@ -439,7 +518,8 @@
 						if (res.confirm) {
 							recharge({
 									price: parseFloat(value),
-									type: 1
+									type: 1,
+									trade: e.detail.value.trade
 								})
 								.then(res => {
 									return that.$util.Tips({
@@ -532,7 +612,7 @@
 	}
 
 	.cash-withdrawal .wrapper .list .item .name {
-		width: 130rpx;
+		width: 180rpx;
 	}
 
 	.cash-withdrawal .wrapper .list .item .input {
@@ -623,10 +703,12 @@
 	.price {
 		color: var(--view-priceColor);
 	}
-	.pos{
+
+	.pos {
 		padding-left: 26rpx;
 	}
-	.red{
+
+	.red {
 		padding-right: 10rpx;
 		color: var(--view-theme) !important;
 	}

pages/users/user_info/index.vue

@@ -69,6 +69,12 @@
 						</navigator>
 					</view>
 					<!-- #endif -->
+					<view class="item acea-row row-between-wrapper" v-if="userInfo.phone">
+						<view>{{$t(`交易密码`)}}</view>
+						<navigator url="/pages/users/user_pwd_edit/indexs" hover-class="none" class="input">
+							{{$t(`点击修改交易密码`)}}<text class="iconfont icon-xiangyou"></text>
+						</navigator>
+					</view>
 					<view class="item acea-row row-between-wrapper" v-if="userInfo.phone">
 						<view>{{$t(`更换手机号码`)}}</view>
 						<navigator url="/pages/users/user_phone/index?type=1" hover-class="none" class="input">

pages/users/user_integral/guquan.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view class='integral-details' :style="colorStyle">
 			<view class='header'>
-				<view class='currentScore' >{{$t(`当前股权`)}}</view>
+				<view class='currentScore' >{{$t(`复购次数`)}}</view>
 				<view class="scoreNum" style="padding-top: 100rpx;">{{userInfo.share}}</view>
 				<view class='line'></view>
 				<!-- <view class='nav acea-row'>
@@ -51,7 +51,7 @@
 						<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
 					</view>
 					<view class="no-thing" v-if="integralList.length == 0">
-						<emptyPage :title="$t(`暂无股权记录哦～`)"></emptyPage>
+						<emptyPage :title="$t(`暂无记录哦～`)"></emptyPage>
 					</view>
 				</view>
 				<!-- <view class='list2' :hidden='current!=1'>

pages/users/user_money/index.vue

@@ -18,7 +18,7 @@
 							<view v-if="recharge_switch" @click="openSubscribe('/pages/users/user_payment/index')"
 								class='recharge'>{{$t(`充值`)}}</view>
 							<!-- #endif -->
-							<navigator url="/pages/users/user_payment/indexs" hover-class="none" class='recharge'>
+							<navigator url="/pages/users/user_payment/indexss" hover-class="none" class='recharge'>
 								{{$t(`转账`)}}
 							</navigator>
 						</view>

pages/users/user_payment/index.vue

@@ -13,20 +13,22 @@
 						@click="navRecharges(index)">{{$t(item)}}</view>
 				</view>
 				<view class='tip picList' v-if='!active'>
-					<view class="pic-box pic-box-color acea-row row-center-wrapper row-column"
+					<!-- <view class="pic-box pic-box-color acea-row row-center-wrapper row-column"
 						:class="activePic == index ? 'pic-box-color-active' : ''" v-for="(item, index) in picList" :key="index"
 						@click="picCharge(index, item)" v-if="item.price">
 						<view class="pic-number-pic">
 							{{ item.price }}<span class="pic-number"> {{$t(`元`)}}</span>
 						</view>
 						<view class="pic-number">{{$t(`赠送`)}}: {{ item.give_money }} {{$t(`元`)}} </view>
-					</view>
-					<view class="pic-box pic-box-color acea-row row-center-wrapper"
+					</view> -->
+					<!-- <view class="pic-box pic-box-color acea-row row-center-wrapper"
 						:class="activePic == picList.length ? 'pic-box-color-active' : ''" @click="picCharge(picList.length)">
 						<input type="digit" @input="replaceInput" :placeholder="$t(`其他`)" v-model="money"
 							class="pic-box-money pic-number-pic" :placeholder-class="activePic == picList.length ? 'active' :''"
 							:class="activePic == picList.length ? 'pic-box-color-active' : ''" />
-					</view>
+					</view> -->
+					<view class='input'><text>{{$t(`￥`)}}</text><input v-model="money" placeholder="0.00" type='number'
+							placeholder-class='placeholder' name="money"></input></view>
 					<view class="tips-box">
 						<view class="tips mt-30">{{$t(`注意事项`)}}：</view>
 						<view class="tips-samll" v-for="item in rechargeAttention" :key="item">
@@ -38,6 +40,8 @@
 				<view class="tip" v-else>
 					<view class='input'><text>{{$t(`￥`)}}</text><input v-model="number" placeholder="0.00" type='number'
 							placeholder-class='placeholder' name="number"></input></view>
+					<view class='input'><input v-model="trade" placeholder="请输入交易密码" type='password'
+							placeholder-class='placeholders' name="trade" ></input></view>
 					<view class="tips-title">
 						<view style="font-weight: bold; font-size: 26rpx;">{{$t(`提示`)}}：</view>
 						<view style="margin-top: 10rpx;">{{$t(`当前可转入佣金为`)}} <text
@@ -99,6 +103,7 @@
 		data() {
 			let that = this;
 			return {
+				trade: '',
 				now_money: 0,
 				navRecharge: [this.$t(`账户充值`), this.$t(`佣金转入`)],
 				active: 0,
@@ -327,7 +332,7 @@
 								url: '/pages/users/user_money/index'
 							});
 							break;
-						// case 'WECHAT_PAY':
+							// case 'WECHAT_PAY':
 						case 'HUIFU':
 							that.toPay = true;
 							// #ifdef MP
@@ -529,6 +534,11 @@
 							title: that.$t(`请输入金额`)
 						});
 					}
+					if(!that.trade) {
+						return that.$util.Tips({
+							title: that.$t(`请输入交易密码`)
+						});
+					}
 					uni.showModal({
 						title: that.$t(`转入余额`),
 						content: that.$t(`转入余额后无法再次转出，确认是否转入余额`),
@@ -536,7 +546,8 @@
 							if (res.confirm) {
 								recharge({
 										price: parseFloat(value),
-										type: 1
+										type: 1,
+										trade: that.trade
 									})
 									.then(res => {
 										// that.$set(that, 'userinfo.now_money', that.$util.$h.Add(value, that.userinfo.now_money))
@@ -628,8 +639,8 @@
 	}
 
 	.payment .input input {
-		padding-right: 106rpx;
-		width: 300rpx;
+		// padding-right: 106rpx;
+		// width: 300rpx;
 		height: 94rpx;
 		text-align: center;
 		font-size: 70rpx;
@@ -640,6 +651,12 @@
 		height: 100%;
 		line-height: 94rpx;
 	}
+	.payment .placeholders {
+		color: #d0d0d0;
+		height: 100%;
+		line-height: 94rpx;
+		font-size:50rpx;
+	}
 
 	.payment .tip {
 		font-size: 26rpx;

pages/users/user_payment/indexs.vue

@@ -11,6 +11,7 @@
 				<view class='input'><input v-model="uid" placeholder="请输入接收人ID" type='number'
 						placeholder-class='placeholder' name="number" style="padding-right: 0;width: 100%;"></input>
 				</view>
+
 				<!-- <view class="nav acea-row row-around row-middle" v-if="navRecharge.length > 1">
 					<view class="item" :class="active==index?'on':''" v-for="(item,index) in navRecharge" :key="index"
 						@click="navRecharges(index)">{{$t(item)}}</view>
@@ -32,6 +33,9 @@
 							:placeholder-class="activePic == picList.length ? 'active' :''"
 							:class="activePic == picList.length ? 'pic-box-color-active' : ''" />
 					</view>
+					<view class='input'><input v-model="trade" placeholder="请输入交易密码" type='password'
+							placeholder-class='placeholder' name="trade" style="padding-right: 0;width: 100%;"></input>
+					</view>
 					<!-- <view class="tips-box">
 						<view class="tips mt-30">{{$t(`注意事项`)}}：</view>
 						<view class="tips-samll" v-for="item in rechargeAttention" :key="item">
@@ -43,9 +47,6 @@
 				<button class='but bg-color' @click="submitSub"> {{$t(`立即转账`) }}</button>
 			</view>
 		</form>
-		<!-- #ifdef MP -->
-		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
-		<!-- #endif -->
 		<!-- #ifndef MP -->
 		<home></home>
 		<!-- #endif -->
@@ -86,6 +87,7 @@
 		data() {
 			let that = this;
 			return {
+				trade: '',
 				uid: '',
 				now_money: 0,
 				navRecharge: [this.$t(`账户充值`), this.$t(`佣金转入`)],
@@ -280,11 +282,18 @@
 						title: that.$t(`请输入金额`)
 					});
 				}
+				if (!this.trade) {
+					return that.$util.Tips({
+						title: that.$t(`请输入交易密码`)
+					});
+				}
 				tradeMoney({
 					num: price || this.money,
-					to_uid: value
+					to_uid: value,
+					trade: this.trade,
 				}).then(res => {
-					that.$set(that, 'userinfo.now_money', that.$util.$h.Sub(price || this.money, that.userinfo.now_money))
+					that.$set(that, 'userinfo.now_money', that.$util.$h.Sub(price || this.money, that.userinfo
+						.now_money))
 					return that.$util.Tips({
 						title: that.$t(`转账成功`),
 						icon: 'success'

pages/users/user_payment/indexss.vue

@@ -0,0 +1,420 @@
+<template>
+	<view :style="colorStyle">
+		<view class="payment-top acea-row row-column row-center-wrapper">
+			<span class="name">{{$t(`我的余额`)}}</span>
+			<view class="pic">
+				<span class="pic-font"><span class="num"> {{$t(`￥`)}}</span>{{ userInfo.now_money || 0 }}</span>
+			</view>
+		</view>
+		<view class='cash-withdrawal'>
+			<view class='wrapper'>
+				<view  class='list'>
+					<form @submit="subCash">
+						<view class='item acea-row row-between-wrapper'>
+							<view class='name' style="font-size: 36rpx;"><text class='red'>*</text> {{$t(`接收人ID`)}}</view>
+							<view class='input'><input type="number" :placeholder='$t(`请输入接收人ID`)' placeholder-class='placeholder'
+									name="to_uid" style="font-size: 60rpx;"></input></view>
+						</view>
+						<view class='item acea-row row-between-wrapper'>
+							<view class='name' style="font-size: 36rpx;"><text class='red'>*</text> {{$t(`金额`)}}</view>
+							<view class='input'><input type='digit'  :placeholder='$t(`请输入转账金额`)' placeholder-class='placeholder'
+									name="num" style="font-size: 60rpx;"></input></view>
+						</view>
+						<view class='item acea-row row-between-wrapper'>
+							<view class='name' style="font-size: 36rpx;"><text class='red'>*</text> {{$t(`交易密码`)}}</view>
+							<view class='input' ><input :placeholder='$t(`请填写交易密码`)'
+									placeholder-class='placeholder'  name="trade" type='password' style="font-size: 60rpx;"></input></view>
+						</view>
+						<button formType="submit" class='bnt bg-color'>{{$t(`提现`)}}</button>
+					</form>
+				</view>
+			</view>
+		</view>
+		<!-- #ifdef MP -->
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	import {
+		extractCash,
+		extractBank,
+		getUserInfo,
+		recharge,
+		tradeMoney
+	} from '@/api/user.js';
+	import {
+		toLogin
+	} from '@/libs/login.js';
+	import {
+		mapGetters
+	} from "vuex";
+	// #ifdef MP
+	import authorize from '@/components/Authorize';
+	import {
+		openRevenueSubscribe
+	} from '@/utils/SubscribeMessage.js';
+	// #endif
+	import colors from '@/mixins/color.js';
+	export default {
+		components: {
+			// #ifdef MP
+			authorize
+			// #endif
+		},
+		mixins: [colors],
+		data() {
+			return {
+				navList: [],
+				currentTab: 0,
+				index: 0,
+				array: [], //提现银行
+				minPrice: 0.00, //最低提现金额
+				userInfo: [],
+				isClone: false,
+				isAuto: false, //没有授权的不会自动授权
+				isShowAuth: false, //是否隐藏授权
+				qrcodeUrlW: "",
+				qrcodeUrlZ: "",
+				prevent: false, //避免重复提交成功多次
+				weixinExtractType: 0, // 佣金到账方式
+				alipayExtractType: 0, // 佣金到账方式
+				withdrawal_fee: 0, //提现手续费
+				true_money: 0
+			};
+		},
+		computed: mapGetters(['isLogin']),
+		watch: {
+			isLogin: {
+				handler: function(newV, oldV) {
+					if (newV) {
+						this.getUserInfo();
+					}
+				},
+				deep: true
+			}
+		},
+		onLoad() {
+			if (this.isLogin) {
+				this.getUserInfo();
+			} else {
+				toLogin();
+			}
+		},
+		methods: {
+			inputNum: function(e) {
+				let val = e.detail.value;
+				let dot = val.indexOf('.');
+				if (dot > -1) {
+					this.moneyMaxLeng = dot + 3;
+				} else {
+					this.moneyMaxLeng = 8
+				}
+				this.true_money = Math.floor((this.$util.$h.Mul(val, this.$util.$h.Div(this.$util.$h.Sub(100, this
+					.withdrawal_fee), 100))) * 100) / 100 || 0;
+			},
+			// uploadpicW(){
+			// 	this.uploadpic(this.qrcodeUrlW);
+			// },
+			// uploadpicZ(){
+			// 	this.uploadpic(this.qrcodeUrlZ);
+			// },
+			/**
+			 * 上传文件
+			 * 
+			 */
+			uploadpic: function(type) {
+				let that = this;
+				that.$util.uploadImageOne('upload/image', function(res) {
+					if (type === 'W') {
+						that.qrcodeUrlW = res.data.url;
+					} else {
+						that.qrcodeUrlZ = res.data.url;
+					}
+				});
+			},
+			/**
+			 * 删除图片
+			 * 
+			 */
+			DelPicW: function() {
+				this.qrcodeUrlW = "";
+			},
+			DelPicZ: function() {
+				this.qrcodeUrlZ = "";
+			},
+			onLoadFun: function() {
+				this.getUserInfo();
+				this.getUserExtractBank();
+			},
+			// 授权关闭
+			authColse: function(e) {
+				this.isShowAuth = e
+			},
+			getUserExtractBank: function() {
+				let that = this;
+				extractBank().then(res => {
+					let array = res.data.extractBank;
+					array.unshift('请选择银行');
+					array.forEach((v, i) => {
+						array.splice(i, 1, that.$t(v))
+					})
+					that.$set(that, 'array', array);
+					that.minPrice = res.data.minPrice;
+					that.withdrawal_fee = res.data.withdrawal_fee;
+					that.alipayExtractType = res.data.alipayExtractType ? parseInt(res.data.alipayExtractType) : 0;
+					that.weixinExtractType = res.data.weixinExtractType ? parseInt(res.data.weixinExtractType) : 0;
+				});
+			},
+			/**
+			 * 获取个人用户信息
+			 */
+			getUserInfo: function() {
+				let that = this;
+				getUserInfo().then(res => {
+					that.userInfo = res.data;
+				});
+			},
+			swichNav: function(current) {
+				this.currentTab = current;
+			},
+			bindPickerChange: function(e) {
+				this.index = e.detail.value;
+			},
+			subCash(e) {
+				let that = this,
+					value = e.detail.value;
+				if (this.prevent) return
+				if (!value.to_uid) return this.$util.Tips({
+					title: this.$t(`请填写接受人ID`)
+				});
+				if (!value.num) return this.$util.Tips({
+					title: this.$t(`请填写转账金额`)
+				});
+				if (value.num *1 < 0) return this.$util.Tips({
+					title: this.$t(`转账金额不能为负数`)
+				});
+				if (value.num *1 > that.userInfo.now_money * 1) return this.$util.Tips({
+					title: this.$t(`您当前余额不足`)
+				});
+				if(!value.trade) return this.$util.Tips({
+					title: this.$t(`请填写交易密码`)
+				});
+				this.prevent = true
+				tradeMoney(value).then(res => {
+					that.getUserInfo();
+					return this.$util.Tips({
+						title: res.msg,
+						icon: 'success'
+					}, {
+						url: '/pages/users/user_money/index',
+						tab: 2
+					});
+					setTimeout(e => {
+						this.prevent = false
+					}, 1000)
+				}).catch(err => {
+					setTimeout(e => {
+						this.prevent = false
+					}, 1000)
+					return this.$util.Tips({
+						title: err
+					});
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #fff !important;
+	}
+
+	.fontcolor {
+		color: var(--view-theme) !important;
+	}
+
+	.cash-withdrawal .nav {
+		height: 130rpx;
+		box-shadow: 0 10rpx 10rpx #f8f8f8;
+	}
+
+	.cash-withdrawal .nav .item {
+		font-size: 26rpx;
+		flex: 1;
+		text-align: center;
+	}
+
+	.cash-withdrawal .nav .item~.item {
+		border-left: 1px solid #f0f0f0;
+	}
+
+	.cash-withdrawal .nav .item .iconfont {
+		width: 40rpx;
+		height: 40rpx;
+		border-radius: 50%;
+		border: 2rpx solid var(--view-theme);
+		text-align: center;
+		line-height: 37rpx;
+		margin: 0 auto 6rpx auto;
+		font-size: 22rpx;
+		box-sizing: border-box;
+	}
+
+	.cash-withdrawal .nav .item .iconfont.on {
+		background-color: var(--view-theme);
+		color: #fff;
+		border-color: var(--view-theme);
+	}
+
+	.cash-withdrawal .nav .item .line {
+		width: 2rpx;
+		height: 20rpx;
+		margin: 0 auto;
+		transition: height 0.3s;
+	}
+
+	.cash-withdrawal .nav .item .line.on {
+		height: 39rpx;
+	}
+
+	.cash-withdrawal .wrapper .list {
+		padding: 0 30rpx;
+	}
+
+	.cash-withdrawal .wrapper .list .item {
+		border-bottom: 1rpx solid #eee;
+		min-height: 28rpx;
+		font-size: 30rpx;
+		color: #333;
+		padding: 39rpx 0;
+	}
+
+	.cash-withdrawal .wrapper .list .item .name {
+		width: 180rpx;
+	}
+
+	.cash-withdrawal .wrapper .list .item .input {
+		width: 505rpx;
+	}
+
+	.cash-withdrawal .wrapper .list .item .input .placeholder {
+		color: #bbb;
+	}
+
+	.cash-withdrawal .wrapper .list .item .picEwm,
+	.cash-withdrawal .wrapper .list .item .pictrue {
+		width: 140rpx;
+		height: 140rpx;
+		border-radius: 3rpx;
+		position: relative;
+		margin-right: 23rpx;
+	}
+
+	.cash-withdrawal .wrapper .list .item .picEwm image {
+		width: 100%;
+		height: 100%;
+		border-radius: 3rpx;
+	}
+
+	.cash-withdrawal .wrapper .list .item .picEwm .icon-guanbi1 {
+		position: absolute;
+		right: -14rpx;
+		top: -16rpx;
+		font-size: 40rpx;
+	}
+
+	.cash-withdrawal .wrapper .list .item .pictrue {
+		border: 1px solid rgba(221, 221, 221, 1);
+		font-size: 22rpx;
+		color: #BBBBBB;
+	}
+
+	.cash-withdrawal .wrapper .list .item .pictrue .icon-icon25201 {
+		font-size: 47rpx;
+		color: #DDDDDD;
+		margin-bottom: 3px;
+	}
+
+	.cash-withdrawal .wrapper .list .tip {
+		font-size: 26rpx;
+		color: #999;
+		margin-top: 25rpx;
+	}
+
+	.cash-withdrawal .wrapper .list .bnt {
+		font-size: 32rpx;
+		color: #fff;
+		width: 690rpx;
+		height: 90rpx;
+		text-align: center;
+		border-radius: 50rpx;
+		line-height: 90rpx;
+		margin: 64rpx auto;
+	}
+
+	.cash-withdrawal .wrapper .list .tip2 {
+		font-size: 26rpx;
+		color: #999;
+		text-align: center;
+		margin: 44rpx 0 20rpx 0;
+	}
+
+	.cash-withdrawal .wrapper .list .value {
+		height: 135rpx;
+		line-height: 135rpx;
+		border-bottom: 1rpx solid #eee;
+		width: 690rpx;
+		margin: 0 auto;
+	}
+
+	.cash-withdrawal .wrapper .list .value input {
+		font-size: 80rpx;
+		color: #282828;
+		height: 135rpx;
+		text-align: center;
+	}
+
+	.cash-withdrawal .wrapper .list .value .placeholder2 {
+		color: #bbb;
+	}
+
+	.price {
+		color: var(--view-priceColor);
+	}
+	.pos{
+		padding-left: 26rpx;
+	}
+	.red{
+		padding-right: 10rpx;
+		color: var(--view-theme) !important;
+	}
+	.payment-top {
+		width: 100%;
+		height: 350rpx;
+		background-color: var(--view-theme);
+	
+		.name {
+			font-size: 26rpx;
+			color: rgba(255, 255, 255, 0.8);
+			margin-top: -38rpx;
+			margin-bottom: 30rpx;
+		}
+	
+		.pic {
+			font-size: 32rpx;
+			color: #fff;
+	
+			.num {
+				font-size: 56rpx;
+			}
+		}
+	
+		.pic-font {
+			font-size: 78rpx;
+			color: #fff;
+		}
+	}
+</style>

pages/users/user_pwd_edit/indexs.vue

@@ -0,0 +1,248 @@
+<template>
+	<view :style="colorStyle">
+		<view class="ChangePassword">
+			<form @submit="editPwd">
+				<view class="phone">{{$t(`当前手机号`)}}：{{phone}}</view>
+				<view class="list">
+					<view class="item">
+						<input type='password' :placeholder='$t(`设置新六位交易密码`)' placeholder-class='placeholder'
+							name="password" :value="password"></input>
+					</view>
+					<view class="item">
+						<input type='password' :placeholder='$t(`确认新交易密码`)' placeholder-class='placeholder'
+							name="qr_password" :value="qr_password"></input>
+					</view>
+					<view class="item acea-row row-between-wrapper">
+						<input type='number' :placeholder='$t(`填写验证码`)' placeholder-class='placeholder' class="codeIput"
+							name="captcha" :value="captcha"></input>
+						<button class="code font-num" :class="disabled === true ? 'on' : ''" :disabled='disabled'
+							@click="code">
+							{{ text }}
+						</button>
+					</view>
+				</view>
+				<button form-type="submit" class="confirmBnt bg-color">{{$t(`确认修改`)}}</button>
+			</form>
+		</view>
+		<!-- #ifdef MP -->
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
+		<!-- #endif -->
+		<Verify @success="success" :captchaType="captchaType" :imgSize="{ width: '330px', height: '155px' }"
+			ref="verify"></Verify>
+	</view>
+</template>
+
+<script>
+	import sendVerifyCode from "@/mixins/SendVerifyCode";
+	import {
+		phoneRegisterReset,
+		verifyCode
+	} from '@/api/api.js';
+	import {
+		getUserInfo,
+		registerVerify,
+		setTrade
+	} from '@/api/user.js';
+	import {
+		toLogin
+	} from '@/libs/login.js';
+	import {
+		mapGetters
+	} from "vuex";
+	// #ifdef MP
+	import authorize from '@/components/Authorize';
+	// #endif
+	import colors from '@/mixins/color.js';
+	import Verify from '../components/verify/index.vue';
+	export default {
+		mixins: [sendVerifyCode, colors],
+		components: {
+			// #ifdef MP
+			authorize,
+			// #endif
+			Verify
+		},
+		data() {
+			return {
+				userInfo: {},
+				phone: '',
+				password: '',
+				captcha: '',
+				qr_password: '',
+				isAuto: false, //没有授权的不会自动授权
+				isShowAuth: false, //是否隐藏授权
+				key: '',
+			};
+		},
+		computed: mapGetters(['isLogin']),
+		watch: {
+			isLogin: {
+				handler: function(newV, oldV) {
+					if (newV) {
+						this.getUserInfo();
+					}
+				},
+				deep: true
+			}
+		},
+		onLoad() {
+			if (this.isLogin) {
+				this.getUserInfo();
+				verifyCode().then(res => {
+					this.$set(this, 'key', res.data.key)
+				});
+			} else {
+				toLogin()
+			}
+		},
+		methods: {
+			/**
+			 * 授权回调
+			 */
+			onLoadFun: function(e) {
+				this.getUserInfo();
+			},
+			// 授权关闭
+			authColse: function(e) {
+				this.isShowAuth = e
+			},
+			/**
+			 * 获取个人用户信息
+			 */
+			getUserInfo: function() {
+				let that = this;
+				getUserInfo().then(res => {
+					let tel = res.data.phone;
+					let phone = tel.substr(0, 3) + "****" + tel.substr(7);
+					that.$set(that, 'userInfo', res.data);
+					that.phone = phone;
+				});
+			},
+			/**
+			 * 发送验证码
+			 * 
+			 */
+			async code() {
+				let that = this;
+				if (!that.userInfo.phone) return that.$util.Tips({
+					title: that.$t(`手机号码不存在,无法发送验证码！`)
+				});
+				this.$refs.verify.show()
+
+			},
+			async success(data) {
+				let that = this;
+				this.$refs.verify.hide()
+				await registerVerify({
+					phone: that.userInfo.phone,
+					type: 'login',
+					key: that.key,
+					captchaType: this.captchaType,
+					captchaVerification: data.captchaVerification
+				}).then(res => {
+					this.sendCode()
+					that.$util.Tips({
+						title: res.msg
+					});
+				}).catch(err => {
+					return that.$util.Tips({
+						title: err
+					});
+				});
+			},
+			/**
+			 * H5登录 修改密码
+			 * 
+			 */
+			editPwd: function(e) {
+				let that = this,
+					password = e.detail.value.password,
+					qr_password = e.detail.value.qr_password,
+					captcha = e.detail.value.captcha;
+				if (!password) return that.$util.Tips({
+					title: that.$t(`请输入新密码`)
+				});
+				if (qr_password != password) return that.$util.Tips({
+					title: that.$t(`两次输入的密码不一致！`)
+				});
+				if (!captcha) return that.$util.Tips({
+					title: that.$t(`请输入验证码`)
+				});
+				setTrade({
+					account: that.userInfo.phone,
+					captcha: captcha,
+					trade: password
+				}).then(res => {
+					return that.$util.Tips({
+						title: res.msg
+					}, {
+						tab: 3,
+						url: 1
+					});
+				}).catch(err => {
+					return that.$util.Tips({
+						title: err
+					});
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #fff !important;
+	}
+
+	.ChangePassword .phone {
+		font-size: 32rpx;
+		font-weight: bold;
+		text-align: center;
+		margin-top: 55rpx;
+	}
+
+	.ChangePassword .list {
+		width: 580rpx;
+		margin: 53rpx auto 0 auto;
+	}
+
+	.ChangePassword .list .item {
+		width: 100%;
+		height: 110rpx;
+		border-bottom: 2rpx solid #f0f0f0;
+	}
+
+	.ChangePassword .list .item input {
+		width: 100%;
+		height: 100%;
+		font-size: 32rpx;
+	}
+
+	.ChangePassword .list .item .placeholder {
+		color: #b9b9bc;
+	}
+
+	.ChangePassword .list .item input.codeIput {
+		width: 340rpx;
+	}
+
+	.ChangePassword .list .item .code {
+		font-size: 32rpx;
+		background-color: #fff;
+	}
+
+	.ChangePassword .list .item .code.on {
+		color: #b9b9bc !important;
+	}
+
+	.ChangePassword .confirmBnt {
+		font-size: 32rpx;
+		width: 580rpx;
+		height: 90rpx;
+		border-radius: 45rpx;
+		color: #fff;
+		margin: 92rpx auto 0 auto;
+		text-align: center;
+		line-height: 90rpx;
+	}
+</style>

pages/users/user_spread_code/index.vue

@@ -75,7 +75,7 @@
 			authorize,
 			// #endif
 			home,
-			zbCode
+			zbCode,
 		},
 		mixins: [colors],
 		data() {
@@ -221,11 +221,11 @@
 					// #endif
 					// #ifdef H5
 					img = await this.imgToBase(res.data.spread[i].pic, res.data.qrcode)
-					arr2 = [img.code || this.codeSrc, img.image]
+					arr2 = [this.codeSrc, img.image]
 					// #endif
 					// #ifdef APP-PLUS
 					img = await this.imgToBase(res.data.spread[i].pic, res.data.qrcode)
-					arr2 = [img.code || this.codeSrc, res.data.spread[i].pic]
+					arr2 = [this.codeSrc, res.data.spread[i].pic]
 					// #endif
 					that.$util.userPosterCanvas(arr2, res.data.nickname, res.data.site_name, i, this
 						.wd,

pages/users/user_spread_money/index.vue

@@ -26,7 +26,7 @@
 								<block v-for="(child, indexn) in item.child" :key="indexn">
 									<view class="itemn acea-row row-between-wrapper">
 										<view class="title">
-											<view class="name line1">{{ type == 1 ? $t(child.mark) : $t(child.title) }}</view>
+											<view class="name line1">{{ $t(child.title) }}</view>
 											<view>{{ child.add_time }}</view>
 											<view class="fail-msg" v-if="child.fail_msg">{{ $t(`原因`) }}：{{ child.fail_msg }}</view>
 											<!-- <view class="fail-msg" v-else-if="child.extract_type">

pages/users/user_spread_user/index.vue

@@ -69,7 +69,7 @@
 					<text class='iconfont icon-dingdan'></text>
 					<view>{{userInfo.is_division?$t(`事业部`):$t(`代理商`)}}{{$t(`推广订单`)}}</view>
 				</navigator>
-				<navigator url='/pages/users/promoter_rank/index' hover-class="none"
+				<!-- <navigator url='/pages/users/promoter_rank/index' hover-class="none"
 					class='item acea-row row-center-wrapper row-column'>
 					<text class='iconfont icon-paihang1'></text>
 					<view>{{$t(`推广人排行`)}}</view>
@@ -78,7 +78,7 @@
 					class='item acea-row row-center-wrapper row-column'>
 					<text class='iconfont icon-paihang'></text>
 					<view>{{$t(`佣金排行`)}}</view>
-				</navigator>
+				</navigator> -->
 				<navigator v-if="userInfo.division_open && userInfo.is_agent" url='/pages/users/staff_list/index' hover-class="none"
 					class='item acea-row row-center-wrapper row-column'>
 					<text class='iconfont icon-tuandui'></text>

unpackage/dist/build/web/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>智宝</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.ed4a2d2b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.6bfe603f.js></script><script src=/static/js/index.9e12f829.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.ed4a2d2b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.fdde7d21.js></script><script src=/static/js/index.af6b38d1.js></script></body></html>

unpackage/dist/build/web/static/js/pages-annex-web_view-index.30314e87.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-annex-web_view-index"],{"5a94":function(t,n,e){"use strict";e.r(n);var i=e("69945"),r=e("92a3");for(var u in r)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return r[t]}))}(u);var a=e("828b"),o=Object(a["a"])(r["default"],i["b"],i["c"],!1,null,null,null,!1,i["a"],void 0);n["default"]=o.exports},69945:function(t,n,e){"use strict";e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return r})),e.d(n,"a",(function(){}));var i=function(){var t=this.$createElement,n=this._self._c||t;return n("v-uni-web-view",{staticClass:"web-view",style:{width:this.windowW+"px",height:this.windowH+"px"},attrs:{"webview-styles":this.webviewStyles,src:this.url}})},r=[]},71016:function(t,n,e){"use strict";e("6a54"),Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var i={data:function(){return{windowH:0,windowW:0,webviewStyles:{progress:{color:"transparent"}},url:""}},onLoad:function(t){this.url=t.url;try{var n=uni.getSystemInfoSync();this.windowW=n.windowWidth,this.windowH=n.windowHeight}catch(e){}}};n.default=i},"92a3":function(t,n,e){"use strict";e.r(n);var i=e("71016"),r=e.n(i);for(var u in i)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(u);n["default"]=r.a}}]);