diff --git a/App.vue b/App.vue index ed1993c..4a362c5 100644 --- a/App.vue +++ b/App.vue @@ -25,6 +25,16 @@ export default { }); let uuid = plus.device.uuid; // #endif + // #ifdef H5 + if (typeof window !== "undefined" && window.location) { + const pathname = window.location.pathname || ""; + if (pathname && pathname !== "/" && pathname.includes("pages/")) { + const cleanPath = pathname.startsWith("/") ? pathname.slice(1) : pathname; + const search = window.location.search || ""; + window.location.replace(`${window.location.origin}/#/${cleanPath}${search}`); + } + } + // #endif }, onShow: function () { console.log("App Show"); diff --git a/api/cart.js b/api/cart.js index 67de22f..b9013a7 100644 --- a/api/cart.js +++ b/api/cart.js @@ -42,23 +42,23 @@ export function updateGoodsNum(data) { // 查询结算列表 -export function getSettleList(data) { +export function getSettleList(data) { // return request.post('/common/getSmsCode',qs.stringify(params)); return request({ url: "/cart/getSettleList", method: "post", data, }); -} - -// 立即购买预结算（含优惠券可用性和抵扣后金额） -export function getDirectSettleList(data) { - return request({ - url: "/cart/getDirectSettleList", - method: "post", - data, - }); -} +} + +// 立即购买预结算（含优惠券可用性和抵扣后金额） +export function getDirectSettleList(data) { + return request({ + url: "/cart/getDirectSettleList", + method: "post", + data, + }); +} // 结算下单 export function settle(data) { @@ -82,13 +82,20 @@ export function setSeckillOrder(data) { url: "/seckill/order", method: "post", data, - // cha:1 - // headers: { - // "Content-Type": "application/x-www-form-urlencoded" - // } }); } +// 秒杀下单 +export function setGroupBuyOrder(data) { + return request({ + url: "/groupBuy/order/0910", + method: "post", + data, + }); +} + +setGroupBuyOrder + // 查询运费 export function getPostageQuery(data) { diff --git a/api/order.js b/api/order.js index f07bc52..9fcafa2 100644 --- a/api/order.js +++ b/api/order.js @@ -191,4 +191,13 @@ export function applyUpdateAddress(data) { method: "post", data, }); +} + +// 团长取消尚无其他成员参加的拼团 +export function cancelTeam(data) { + return request({ + url: "/groupBuy/cancelTeam/0910", + method: "post", + data, + }); } \ No newline at end of file diff --git a/api/product.js b/api/product.js index 0f3e70b..73448d3 100644 --- a/api/product.js +++ b/api/product.js @@ -145,3 +145,42 @@ export function getSearchGoodsList(params) { }); } +// 拼团商品列表 +export function getGroupBuyList(params) { + return request({ + url: "/groupBuy/getList/0910", + method: "get", + data: params, + }); +} + +// 可直接参加的拼团列表 +export function getGroupBuyJoinableList(params) { + return request({ + url: "/groupBuy/getJoinableList/0910", + method: "get", + data: params, + }); +} + +// 当前拼团活动信息 (倒计时、startTime, endTime等) +export function getGroupBuyCurrent(params) { + return request({ + url: "/groupBuy/current/0910", + method: "get", + data: params, + }); +} + +// 获取拼团详情 +export function getTeamDetail(params) { + return request({ + url: "/groupBuy/getTeamDetail/0910", + method: "get", + data: params, + }); +} + + + + diff --git a/components/common/product-group-card.vue b/components/common/product-group-card.vue new file mode 100644 index 0000000..dc317a3 --- /dev/null +++ b/components/common/product-group-card.vue @@ -0,0 +1,344 @@ + + + + + diff --git a/components/common/product-seckill-card.vue b/components/common/product-seckill-card.vue index a1be351..fdf6bdf 100644 --- a/components/common/product-seckill-card.vue +++ b/components/common/product-seckill-card.vue @@ -32,6 +32,10 @@ ⚡ 加倍补{{ item.subsidy }}积分 + + ⚡ + 立省{{ item.secDiscount || item.subsidy || item.discount || 100 }}元 + @@ -121,6 +125,8 @@ export default { let url = "/pages/other_package/productInfo/productInfo?id=" + item.id; if (this.activedType === 'seckill') { url = "/pages/other_package/productInfo/productInfo?id=" + item.id + "&activedType=" + this.activedType + "&activityId=" + item.activityId; + } else if (this.activedType === 'group') { + url = "/pages/other_package/productInfo/productInfo?id=" + item.id + "&activedType=" + this.activedType; } uni.navigateTo({ url: url, diff --git a/components/header.vue b/components/header.vue index dc1c2e3..96c3c1a 100644 --- a/components/header.vue +++ b/components/header.vue @@ -48,11 +48,33 @@ const leftPath = this.leftPath; const leftPathType = this.leftPathType; if(leftPathType === "navigateTo"){ - uni.navigateBack(); + const pages = getCurrentPages(); + if (pages && pages.length > 1) { + const prevPage = pages[pages.length - 2]; + const route = prevPage ? (prevPage.route || (prevPage.$page && prevPage.$page.route)) : ''; + if (!leftPath || (route && leftPath.includes(route))) { + uni.navigateBack(); + return; + } + } + if (leftPath) { + uni.redirectTo({ + url: leftPath, + fail: () => { + uni.navigateTo({ url: leftPath }); + } + }); + } else { + uni.navigateBack(); + } }else if(leftPathType === "switchTab" && leftPath){ uni.switchTab({ url: leftPath, }); + }else if(leftPathType === "redirectTo" && leftPath){ + uni.redirectTo({ + url: leftPath, + }); } }, rightJump() { diff --git a/pages.json b/pages.json index d0e56ed..5323d4d 100644 --- a/pages.json +++ b/pages.json @@ -698,6 +698,18 @@ "style": { "navigationStyle": "custom" } + }, + { + "path": "group-buying/group-buying", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "group-detail/group-detail", + "style": { + "navigationStyle": "custom" + } } ] } diff --git a/pages/active/components/share-popup.vue b/pages/active/components/share-popup.vue new file mode 100644 index 0000000..d6f98ac --- /dev/null +++ b/pages/active/components/share-popup.vue @@ -0,0 +1,1092 @@ + + + + + diff --git a/pages/active/components/tki-qrcode/qrcode.js b/pages/active/components/tki-qrcode/qrcode.js new file mode 100644 index 0000000..6ea6553 --- /dev/null +++ b/pages/active/components/tki-qrcode/qrcode.js @@ -0,0 +1,1201 @@ +let QRCode = {}; +(function () { + /** + * 获取单个字符的utf8编码 + * unicode BMP平面约65535个字符 + * @param {num} code + * return {array} + */ + function unicodeFormat8(code) { + // 1 byte + var c0, c1, c2; + if (code < 128) { + return [code]; + // 2 bytes + } else if (code < 2048) { + c0 = 192 + (code >> 6); + c1 = 128 + (code & 63); + return [c0, c1]; + // 3 bytes + } else { + c0 = 224 + (code >> 12); + c1 = 128 + (code >> 6 & 63); + c2 = 128 + (code & 63); + return [c0, c1, c2]; + } + } + /** + * 获取字符串的utf8编码字节串 + * @param {string} string + * @return {array} + */ + function getUTF8Bytes(string) { + var utf8codes = []; + for (var i = 0; i < string.length; i++) { + var code = string.charCodeAt(i); + var utf8 = unicodeFormat8(code); + for (var j = 0; j < utf8.length; j++) { + utf8codes.push(utf8[j]); + } + } + return utf8codes; + } + /** + * 二维码算法实现 + * @param {string} data 要编码的信息字符串 + * @param {num} errorCorrectLevel 纠错等级 + */ + function QRCodeAlg(data, errorCorrectLevel) { + this.typeNumber = -1; //版本 + this.errorCorrectLevel = errorCorrectLevel; + this.modules = null; //二维矩阵，存放最终结果 + this.moduleCount = 0; //矩阵大小 + this.dataCache = null; //数据缓存 + this.rsBlocks = null; //版本数据信息 + this.totalDataCount = -1; //可使用的数据量 + this.data = data; + this.utf8bytes = getUTF8Bytes(data); + this.make(); + } + QRCodeAlg.prototype = { + constructor: QRCodeAlg, + /** + * 获取二维码矩阵大小 + * @return {num} 矩阵大小 + */ + getModuleCount: function () { + return this.moduleCount; + }, + /** + * 编码 + */ + make: function () { + this.getRightType(); + this.dataCache = this.createData(); + this.createQrcode(); + }, + /** + * 设置二位矩阵功能图形 + * @param {bool} test 表示是否在寻找最好掩膜阶段 + * @param {num} maskPattern 掩膜的版本 + */ + makeImpl: function (maskPattern) { + this.moduleCount = this.typeNumber * 4 + 17; + this.modules = new Array(this.moduleCount); + for (var row = 0; row < this.moduleCount; row++) { + this.modules[row] = new Array(this.moduleCount); + } + this.setupPositionProbePattern(0, 0); + this.setupPositionProbePattern(this.moduleCount - 7, 0); + this.setupPositionProbePattern(0, this.moduleCount - 7); + this.setupPositionAdjustPattern(); + this.setupTimingPattern(); + this.setupTypeInfo(true, maskPattern); + if (this.typeNumber >= 7) { + this.setupTypeNumber(true); + } + this.mapData(this.dataCache, maskPattern); + }, + /** + * 设置二维码的位置探测图形 + * @param {num} row 探测图形的中心横坐标 + * @param {num} col 探测图形的中心纵坐标 + */ + setupPositionProbePattern: function (row, col) { + for (var r = -1; r <= 7; r++) { + if (row + r <= -1 || this.moduleCount <= row + r) continue; + for (var c = -1; c <= 7; c++) { + if (col + c <= -1 || this.moduleCount <= col + c) continue; + if ((0 <= r && r <= 6 && (c == 0 || c == 6)) || (0 <= c && c <= 6 && (r == 0 || r == 6)) || (2 <= r && r <= 4 && 2 <= c && c <= 4)) { + this.modules[row + r][col + c] = true; + } else { + this.modules[row + r][col + c] = false; + } + } + } + }, + /** + * 创建二维码 + * @return {[type]} [description] + */ + createQrcode: function () { + var minLostPoint = 0; + var pattern = 0; + var bestModules = null; + for (var i = 0; i < 8; i++) { + this.makeImpl(i); + var lostPoint = QRUtil.getLostPoint(this); + if (i == 0 || minLostPoint > lostPoint) { + minLostPoint = lostPoint; + pattern = i; + bestModules = this.modules; + } + } + this.modules = bestModules; + this.setupTypeInfo(false, pattern); + if (this.typeNumber >= 7) { + this.setupTypeNumber(false); + } + }, + /** + * 设置定位图形 + * @return {[type]} [description] + */ + setupTimingPattern: function () { + for (var r = 8; r < this.moduleCount - 8; r++) { + if (this.modules[r][6] != null) { + continue; + } + this.modules[r][6] = (r % 2 == 0); + if (this.modules[6][r] != null) { + continue; + } + this.modules[6][r] = (r % 2 == 0); + } + }, + /** + * 设置矫正图形 + * @return {[type]} [description] + */ + setupPositionAdjustPattern: function () { + var pos = QRUtil.getPatternPosition(this.typeNumber); + for (var i = 0; i < pos.length; i++) { + for (var j = 0; j < pos.length; j++) { + var row = pos[i]; + var col = pos[j]; + if (this.modules[row][col] != null) { + continue; + } + for (var r = -2; r <= 2; r++) { + for (var c = -2; c <= 2; c++) { + if (r == -2 || r == 2 || c == -2 || c == 2 || (r == 0 && c == 0)) { + this.modules[row + r][col + c] = true; + } else { + this.modules[row + r][col + c] = false; + } + } + } + } + } + }, + /** + * 设置版本信息（7以上版本才有） + * @param {bool} test 是否处于判断最佳掩膜阶段 + * @return {[type]} [description] + */ + setupTypeNumber: function (test) { + var bits = QRUtil.getBCHTypeNumber(this.typeNumber); + for (var i = 0; i < 18; i++) { + var mod = (!test && ((bits >> i) & 1) == 1); + this.modules[Math.floor(i / 3)][i % 3 + this.moduleCount - 8 - 3] = mod; + this.modules[i % 3 + this.moduleCount - 8 - 3][Math.floor(i / 3)] = mod; + } + }, + /** + * 设置格式信息（纠错等级和掩膜版本） + * @param {bool} test + * @param {num} maskPattern 掩膜版本 + * @return {} + */ + setupTypeInfo: function (test, maskPattern) { + var data = (QRErrorCorrectLevel[this.errorCorrectLevel] << 3) | maskPattern; + var bits = QRUtil.getBCHTypeInfo(data); + // vertical + for (var i = 0; i < 15; i++) { + var mod = (!test && ((bits >> i) & 1) == 1); + if (i < 6) { + this.modules[i][8] = mod; + } else if (i < 8) { + this.modules[i + 1][8] = mod; + } else { + this.modules[this.moduleCount - 15 + i][8] = mod; + } + // horizontal + var mod = (!test && ((bits >> i) & 1) == 1); + if (i < 8) { + this.modules[8][this.moduleCount - i - 1] = mod; + } else if (i < 9) { + this.modules[8][15 - i - 1 + 1] = mod; + } else { + this.modules[8][15 - i - 1] = mod; + } + } + // fixed module + this.modules[this.moduleCount - 8][8] = (!test); + }, + /** + * 数据编码 + * @return {[type]} [description] + */ + createData: function () { + var buffer = new QRBitBuffer(); + var lengthBits = this.typeNumber > 9 ? 16 : 8; + buffer.put(4, 4); //添加模式 + buffer.put(this.utf8bytes.length, lengthBits); + for (var i = 0, l = this.utf8bytes.length; i < l; i++) { + buffer.put(this.utf8bytes[i], 8); + } + if (buffer.length + 4 <= this.totalDataCount * 8) { + buffer.put(0, 4); + } + // padding + while (buffer.length % 8 != 0) { + buffer.putBit(false); + } + // padding + while (true) { + if (buffer.length >= this.totalDataCount * 8) { + break; + } + buffer.put(QRCodeAlg.PAD0, 8); + if (buffer.length >= this.totalDataCount * 8) { + break; + } + buffer.put(QRCodeAlg.PAD1, 8); + } + return this.createBytes(buffer); + }, + /** + * 纠错码编码 + * @param {buffer} buffer 数据编码 + * @return {[type]} + */ + createBytes: function (buffer) { + var offset = 0; + var maxDcCount = 0; + var maxEcCount = 0; + var length = this.rsBlock.length / 3; + var rsBlocks = new Array(); + for (var i = 0; i < length; i++) { + var count = this.rsBlock[i * 3 + 0]; + var totalCount = this.rsBlock[i * 3 + 1]; + var dataCount = this.rsBlock[i * 3 + 2]; + for (var j = 0; j < count; j++) { + rsBlocks.push([dataCount, totalCount]); + } + } + var dcdata = new Array(rsBlocks.length); + var ecdata = new Array(rsBlocks.length); + for (var r = 0; r < rsBlocks.length; r++) { + var dcCount = rsBlocks[r][0]; + var ecCount = rsBlocks[r][1] - dcCount; + maxDcCount = Math.max(maxDcCount, dcCount); + maxEcCount = Math.max(maxEcCount, ecCount); + dcdata[r] = new Array(dcCount); + for (var i = 0; i < dcdata[r].length; i++) { + dcdata[r][i] = 0xff & buffer.buffer[i + offset]; + } + offset += dcCount; + var rsPoly = QRUtil.getErrorCorrectPolynomial(ecCount); + var rawPoly = new QRPolynomial(dcdata[r], rsPoly.getLength() - 1); + var modPoly = rawPoly.mod(rsPoly); + ecdata[r] = new Array(rsPoly.getLength() - 1); + for (var i = 0; i < ecdata[r].length; i++) { + var modIndex = i + modPoly.getLength() - ecdata[r].length; + ecdata[r][i] = (modIndex >= 0) ? modPoly.get(modIndex) : 0; + } + } + var data = new Array(this.totalDataCount); + var index = 0; + for (var i = 0; i < maxDcCount; i++) { + for (var r = 0; r < rsBlocks.length; r++) { + if (i < dcdata[r].length) { + data[index++] = dcdata[r][i]; + } + } + } + for (var i = 0; i < maxEcCount; i++) { + for (var r = 0; r < rsBlocks.length; r++) { + if (i < ecdata[r].length) { + data[index++] = ecdata[r][i]; + } + } + } + return data; + + }, + /** + * 布置模块，构建最终信息 + * @param {} data + * @param {} maskPattern + * @return {} + */ + mapData: function (data, maskPattern) { + var inc = -1; + var row = this.moduleCount - 1; + var bitIndex = 7; + var byteIndex = 0; + for (var col = this.moduleCount - 1; col > 0; col -= 2) { + if (col == 6) col--; + while (true) { + for (var c = 0; c < 2; c++) { + if (this.modules[row][col - c] == null) { + var dark = false; + if (byteIndex < data.length) { + dark = (((data[byteIndex] >>> bitIndex) & 1) == 1); + } + var mask = QRUtil.getMask(maskPattern, row, col - c); + if (mask) { + dark = !dark; + } + this.modules[row][col - c] = dark; + bitIndex--; + if (bitIndex == -1) { + byteIndex++; + bitIndex = 7; + } + } + } + row += inc; + if (row < 0 || this.moduleCount <= row) { + row -= inc; + inc = -inc; + break; + } + } + } + } + }; + /** + * 填充字段 + */ + QRCodeAlg.PAD0 = 0xEC; + QRCodeAlg.PAD1 = 0x11; + //--------------------------------------------------------------------- + // 纠错等级对应的编码 + //--------------------------------------------------------------------- + var QRErrorCorrectLevel = [1, 0, 3, 2]; + //--------------------------------------------------------------------- + // 掩膜版本 + //--------------------------------------------------------------------- + var QRMaskPattern = { + PATTERN000: 0, + PATTERN001: 1, + PATTERN010: 2, + PATTERN011: 3, + PATTERN100: 4, + PATTERN101: 5, + PATTERN110: 6, + PATTERN111: 7 + }; + //--------------------------------------------------------------------- + // 工具类 + //--------------------------------------------------------------------- + var QRUtil = { + /* + 每个版本矫正图形的位置 + */ + PATTERN_POSITION_TABLE: [ + [], + [6, 18], + [6, 22], + [6, 26], + [6, 30], + [6, 34], + [6, 22, 38], + [6, 24, 42], + [6, 26, 46], + [6, 28, 50], + [6, 30, 54], + [6, 32, 58], + [6, 34, 62], + [6, 26, 46, 66], + [6, 26, 48, 70], + [6, 26, 50, 74], + [6, 30, 54, 78], + [6, 30, 56, 82], + [6, 30, 58, 86], + [6, 34, 62, 90], + [6, 28, 50, 72, 94], + [6, 26, 50, 74, 98], + [6, 30, 54, 78, 102], + [6, 28, 54, 80, 106], + [6, 32, 58, 84, 110], + [6, 30, 58, 86, 114], + [6, 34, 62, 90, 118], + [6, 26, 50, 74, 98, 122], + [6, 30, 54, 78, 102, 126], + [6, 26, 52, 78, 104, 130], + [6, 30, 56, 82, 108, 134], + [6, 34, 60, 86, 112, 138], + [6, 30, 58, 86, 114, 142], + [6, 34, 62, 90, 118, 146], + [6, 30, 54, 78, 102, 126, 150], + [6, 24, 50, 76, 102, 128, 154], + [6, 28, 54, 80, 106, 132, 158], + [6, 32, 58, 84, 110, 136, 162], + [6, 26, 54, 82, 110, 138, 166], + [6, 30, 58, 86, 114, 142, 170] + ], + G15: (1 << 10) | (1 << 8) | (1 << 5) | (1 << 4) | (1 << 2) | (1 << 1) | (1 << 0), + G18: (1 << 12) | (1 << 11) | (1 << 10) | (1 << 9) | (1 << 8) | (1 << 5) | (1 << 2) | (1 << 0), + G15_MASK: (1 << 14) | (1 << 12) | (1 << 10) | (1 << 4) | (1 << 1), + /* + BCH编码格式信息 + */ + getBCHTypeInfo: function (data) { + var d = data << 10; + while (QRUtil.getBCHDigit(d) - QRUtil.getBCHDigit(QRUtil.G15) >= 0) { + d ^= (QRUtil.G15 << (QRUtil.getBCHDigit(d) - QRUtil.getBCHDigit(QRUtil.G15))); + } + return ((data << 10) | d) ^ QRUtil.G15_MASK; + }, + /* + BCH编码版本信息 + */ + getBCHTypeNumber: function (data) { + var d = data << 12; + while (QRUtil.getBCHDigit(d) - QRUtil.getBCHDigit(QRUtil.G18) >= 0) { + d ^= (QRUtil.G18 << (QRUtil.getBCHDigit(d) - QRUtil.getBCHDigit(QRUtil.G18))); + } + return (data << 12) | d; + }, + /* + 获取BCH位信息 + */ + getBCHDigit: function (data) { + var digit = 0; + while (data != 0) { + digit++; + data >>>= 1; + } + return digit; + }, + /* + 获取版本对应的矫正图形位置 + */ + getPatternPosition: function (typeNumber) { + return QRUtil.PATTERN_POSITION_TABLE[typeNumber - 1]; + }, + /* + 掩膜算法 + */ + getMask: function (maskPattern, i, j) { + switch (maskPattern) { + case QRMaskPattern.PATTERN000: + return (i + j) % 2 == 0; + case QRMaskPattern.PATTERN001: + return i % 2 == 0; + case QRMaskPattern.PATTERN010: + return j % 3 == 0; + case QRMaskPattern.PATTERN011: + return (i + j) % 3 == 0; + case QRMaskPattern.PATTERN100: + return (Math.floor(i / 2) + Math.floor(j / 3)) % 2 == 0; + case QRMaskPattern.PATTERN101: + return (i * j) % 2 + (i * j) % 3 == 0; + case QRMaskPattern.PATTERN110: + return ((i * j) % 2 + (i * j) % 3) % 2 == 0; + case QRMaskPattern.PATTERN111: + return ((i * j) % 3 + (i + j) % 2) % 2 == 0; + default: + throw new Error("bad maskPattern:" + maskPattern); + } + }, + /* + 获取RS的纠错多项式 + */ + getErrorCorrectPolynomial: function (errorCorrectLength) { + var a = new QRPolynomial([1], 0); + for (var i = 0; i < errorCorrectLength; i++) { + a = a.multiply(new QRPolynomial([1, QRMath.gexp(i)], 0)); + } + return a; + }, + /* + 获取评价 + */ + getLostPoint: function (qrCode) { + var moduleCount = qrCode.getModuleCount(), + lostPoint = 0, + darkCount = 0; + for (var row = 0; row < moduleCount; row++) { + var sameCount = 0; + var head = qrCode.modules[row][0]; + for (var col = 0; col < moduleCount; col++) { + var current = qrCode.modules[row][col]; + //level 3 评价 + if (col < moduleCount - 6) { + if (current && !qrCode.modules[row][col + 1] && qrCode.modules[row][col + 2] && qrCode.modules[row][col + 3] && qrCode.modules[row][col + 4] && !qrCode.modules[row][col + 5] && qrCode.modules[row][col + 6]) { + if (col < moduleCount - 10) { + if (qrCode.modules[row][col + 7] && qrCode.modules[row][col + 8] && qrCode.modules[row][col + 9] && qrCode.modules[row][col + 10]) { + lostPoint += 40; + } + } else if (col > 3) { + if (qrCode.modules[row][col - 1] && qrCode.modules[row][col - 2] && qrCode.modules[row][col - 3] && qrCode.modules[row][col - 4]) { + lostPoint += 40; + } + } + } + } + //level 2 评价 + if ((row < moduleCount - 1) && (col < moduleCount - 1)) { + var count = 0; + if (current) count++; + if (qrCode.modules[row + 1][col]) count++; + if (qrCode.modules[row][col + 1]) count++; + if (qrCode.modules[row + 1][col + 1]) count++; + if (count == 0 || count == 4) { + lostPoint += 3; + } + } + //level 1 评价 + if (head ^ current) { + sameCount++; + } else { + head = current; + if (sameCount >= 5) { + lostPoint += (3 + sameCount - 5); + } + sameCount = 1; + } + //level 4 评价 + if (current) { + darkCount++; + } + } + } + for (var col = 0; col < moduleCount; col++) { + var sameCount = 0; + var head = qrCode.modules[0][col]; + for (var row = 0; row < moduleCount; row++) { + var current = qrCode.modules[row][col]; + //level 3 评价 + if (row < moduleCount - 6) { + if (current && !qrCode.modules[row + 1][col] && qrCode.modules[row + 2][col] && qrCode.modules[row + 3][col] && qrCode.modules[row + 4][col] && !qrCode.modules[row + 5][col] && qrCode.modules[row + 6][col]) { + if (row < moduleCount - 10) { + if (qrCode.modules[row + 7][col] && qrCode.modules[row + 8][col] && qrCode.modules[row + 9][col] && qrCode.modules[row + 10][col]) { + lostPoint += 40; + } + } else if (row > 3) { + if (qrCode.modules[row - 1][col] && qrCode.modules[row - 2][col] && qrCode.modules[row - 3][col] && qrCode.modules[row - 4][col]) { + lostPoint += 40; + } + } + } + } + //level 1 评价 + if (head ^ current) { + sameCount++; + } else { + head = current; + if (sameCount >= 5) { + lostPoint += (3 + sameCount - 5); + } + sameCount = 1; + } + } + } + // LEVEL4 + var ratio = Math.abs(100 * darkCount / moduleCount / moduleCount - 50) / 5; + lostPoint += ratio * 10; + return lostPoint; + } + + }; + //--------------------------------------------------------------------- + // QRMath使用的数学工具 + //--------------------------------------------------------------------- + var QRMath = { + /* + 将n转化为a^m + */ + glog: function (n) { + if (n < 1) { + throw new Error("glog(" + n + ")"); + } + return QRMath.LOG_TABLE[n]; + }, + /* + 将a^m转化为n + */ + gexp: function (n) { + while (n < 0) { + n += 255; + } + while (n >= 256) { + n -= 255; + } + return QRMath.EXP_TABLE[n]; + }, + EXP_TABLE: new Array(256), + LOG_TABLE: new Array(256) + + }; + for (var i = 0; i < 8; i++) { + QRMath.EXP_TABLE[i] = 1 << i; + } + for (var i = 8; i < 256; i++) { + QRMath.EXP_TABLE[i] = QRMath.EXP_TABLE[i - 4] ^ QRMath.EXP_TABLE[i - 5] ^ QRMath.EXP_TABLE[i - 6] ^ QRMath.EXP_TABLE[i - 8]; + } + for (var i = 0; i < 255; i++) { + QRMath.LOG_TABLE[QRMath.EXP_TABLE[i]] = i; + } + //--------------------------------------------------------------------- + // QRPolynomial 多项式 + //--------------------------------------------------------------------- + /** + * 多项式类 + * @param {Array} num 系数 + * @param {num} shift a^shift + */ + function QRPolynomial(num, shift) { + if (num.length == undefined) { + throw new Error(num.length + "/" + shift); + } + var offset = 0; + while (offset < num.length && num[offset] == 0) { + offset++; + } + this.num = new Array(num.length - offset + shift); + for (var i = 0; i < num.length - offset; i++) { + this.num[i] = num[i + offset]; + } + } + QRPolynomial.prototype = { + get: function (index) { + return this.num[index]; + }, + getLength: function () { + return this.num.length; + }, + /** + * 多项式乘法 + * @param {QRPolynomial} e 被乘多项式 + * @return {[type]} [description] + */ + multiply: function (e) { + var num = new Array(this.getLength() + e.getLength() - 1); + for (var i = 0; i < this.getLength(); i++) { + for (var j = 0; j < e.getLength(); j++) { + num[i + j] ^= QRMath.gexp(QRMath.glog(this.get(i)) + QRMath.glog(e.get(j))); + } + } + return new QRPolynomial(num, 0); + }, + /** + * 多项式模运算 + * @param {QRPolynomial} e 模多项式 + * @return {} + */ + mod: function (e) { + var tl = this.getLength(), + el = e.getLength(); + if (tl - el < 0) { + return this; + } + var num = new Array(tl); + for (var i = 0; i < tl; i++) { + num[i] = this.get(i); + } + while (num.length >= el) { + var ratio = QRMath.glog(num[0]) - QRMath.glog(e.get(0)); + + for (var i = 0; i < e.getLength(); i++) { + num[i] ^= QRMath.gexp(QRMath.glog(e.get(i)) + ratio); + } + while (num[0] == 0) { + num.shift(); + } + } + return new QRPolynomial(num, 0); + } + }; + + //--------------------------------------------------------------------- + // RS_BLOCK_TABLE + //--------------------------------------------------------------------- + /* + 二维码各个版本信息[块数, 每块中的数据块数, 每块中的信息块数] + */ + var RS_BLOCK_TABLE = [ + // L + // M + // Q + // H + // 1 + [1, 26, 19], + [1, 26, 16], + [1, 26, 13], + [1, 26, 9], + + // 2 + [1, 44, 34], + [1, 44, 28], + [1, 44, 22], + [1, 44, 16], + + // 3 + [1, 70, 55], + [1, 70, 44], + [2, 35, 17], + [2, 35, 13], + + // 4 + [1, 100, 80], + [2, 50, 32], + [2, 50, 24], + [4, 25, 9], + + // 5 + [1, 134, 108], + [2, 67, 43], + [2, 33, 15, 2, 34, 16], + [2, 33, 11, 2, 34, 12], + + // 6 + [2, 86, 68], + [4, 43, 27], + [4, 43, 19], + [4, 43, 15], + + // 7 + [2, 98, 78], + [4, 49, 31], + [2, 32, 14, 4, 33, 15], + [4, 39, 13, 1, 40, 14], + + // 8 + [2, 121, 97], + [2, 60, 38, 2, 61, 39], + [4, 40, 18, 2, 41, 19], + [4, 40, 14, 2, 41, 15], + + // 9 + [2, 146, 116], + [3, 58, 36, 2, 59, 37], + [4, 36, 16, 4, 37, 17], + [4, 36, 12, 4, 37, 13], + + // 10 + [2, 86, 68, 2, 87, 69], + [4, 69, 43, 1, 70, 44], + [6, 43, 19, 2, 44, 20], + [6, 43, 15, 2, 44, 16], + + // 11 + [4, 101, 81], + [1, 80, 50, 4, 81, 51], + [4, 50, 22, 4, 51, 23], + [3, 36, 12, 8, 37, 13], + + // 12 + [2, 116, 92, 2, 117, 93], + [6, 58, 36, 2, 59, 37], + [4, 46, 20, 6, 47, 21], + [7, 42, 14, 4, 43, 15], + + // 13 + [4, 133, 107], + [8, 59, 37, 1, 60, 38], + [8, 44, 20, 4, 45, 21], + [12, 33, 11, 4, 34, 12], + + // 14 + [3, 145, 115, 1, 146, 116], + [4, 64, 40, 5, 65, 41], + [11, 36, 16, 5, 37, 17], + [11, 36, 12, 5, 37, 13], + + // 15 + [5, 109, 87, 1, 110, 88], + [5, 65, 41, 5, 66, 42], + [5, 54, 24, 7, 55, 25], + [11, 36, 12], + + // 16 + [5, 122, 98, 1, 123, 99], + [7, 73, 45, 3, 74, 46], + [15, 43, 19, 2, 44, 20], + [3, 45, 15, 13, 46, 16], + + // 17 + [1, 135, 107, 5, 136, 108], + [10, 74, 46, 1, 75, 47], + [1, 50, 22, 15, 51, 23], + [2, 42, 14, 17, 43, 15], + + // 18 + [5, 150, 120, 1, 151, 121], + [9, 69, 43, 4, 70, 44], + [17, 50, 22, 1, 51, 23], + [2, 42, 14, 19, 43, 15], + + // 19 + [3, 141, 113, 4, 142, 114], + [3, 70, 44, 11, 71, 45], + [17, 47, 21, 4, 48, 22], + [9, 39, 13, 16, 40, 14], + + // 20 + [3, 135, 107, 5, 136, 108], + [3, 67, 41, 13, 68, 42], + [15, 54, 24, 5, 55, 25], + [15, 43, 15, 10, 44, 16], + + // 21 + [4, 144, 116, 4, 145, 117], + [17, 68, 42], + [17, 50, 22, 6, 51, 23], + [19, 46, 16, 6, 47, 17], + + // 22 + [2, 139, 111, 7, 140, 112], + [17, 74, 46], + [7, 54, 24, 16, 55, 25], + [34, 37, 13], + + // 23 + [4, 151, 121, 5, 152, 122], + [4, 75, 47, 14, 76, 48], + [11, 54, 24, 14, 55, 25], + [16, 45, 15, 14, 46, 16], + + // 24 + [6, 147, 117, 4, 148, 118], + [6, 73, 45, 14, 74, 46], + [11, 54, 24, 16, 55, 25], + [30, 46, 16, 2, 47, 17], + + // 25 + [8, 132, 106, 4, 133, 107], + [8, 75, 47, 13, 76, 48], + [7, 54, 24, 22, 55, 25], + [22, 45, 15, 13, 46, 16], + + // 26 + [10, 142, 114, 2, 143, 115], + [19, 74, 46, 4, 75, 47], + [28, 50, 22, 6, 51, 23], + [33, 46, 16, 4, 47, 17], + + // 27 + [8, 152, 122, 4, 153, 123], + [22, 73, 45, 3, 74, 46], + [8, 53, 23, 26, 54, 24], + [12, 45, 15, 28, 46, 16], + + // 28 + [3, 147, 117, 10, 148, 118], + [3, 73, 45, 23, 74, 46], + [4, 54, 24, 31, 55, 25], + [11, 45, 15, 31, 46, 16], + + // 29 + [7, 146, 116, 7, 147, 117], + [21, 73, 45, 7, 74, 46], + [1, 53, 23, 37, 54, 24], + [19, 45, 15, 26, 46, 16], + + // 30 + [5, 145, 115, 10, 146, 116], + [19, 75, 47, 10, 76, 48], + [15, 54, 24, 25, 55, 25], + [23, 45, 15, 25, 46, 16], + + // 31 + [13, 145, 115, 3, 146, 116], + [2, 74, 46, 29, 75, 47], + [42, 54, 24, 1, 55, 25], + [23, 45, 15, 28, 46, 16], + + // 32 + [17, 145, 115], + [10, 74, 46, 23, 75, 47], + [10, 54, 24, 35, 55, 25], + [19, 45, 15, 35, 46, 16], + + // 33 + [17, 145, 115, 1, 146, 116], + [14, 74, 46, 21, 75, 47], + [29, 54, 24, 19, 55, 25], + [11, 45, 15, 46, 46, 16], + + // 34 + [13, 145, 115, 6, 146, 116], + [14, 74, 46, 23, 75, 47], + [44, 54, 24, 7, 55, 25], + [59, 46, 16, 1, 47, 17], + + // 35 + [12, 151, 121, 7, 152, 122], + [12, 75, 47, 26, 76, 48], + [39, 54, 24, 14, 55, 25], + [22, 45, 15, 41, 46, 16], + + // 36 + [6, 151, 121, 14, 152, 122], + [6, 75, 47, 34, 76, 48], + [46, 54, 24, 10, 55, 25], + [2, 45, 15, 64, 46, 16], + + // 37 + [17, 152, 122, 4, 153, 123], + [29, 74, 46, 14, 75, 47], + [49, 54, 24, 10, 55, 25], + [24, 45, 15, 46, 46, 16], + + // 38 + [4, 152, 122, 18, 153, 123], + [13, 74, 46, 32, 75, 47], + [48, 54, 24, 14, 55, 25], + [42, 45, 15, 32, 46, 16], + + // 39 + [20, 147, 117, 4, 148, 118], + [40, 75, 47, 7, 76, 48], + [43, 54, 24, 22, 55, 25], + [10, 45, 15, 67, 46, 16], + + // 40 + [19, 148, 118, 6, 149, 119], + [18, 75, 47, 31, 76, 48], + [34, 54, 24, 34, 55, 25], + [20, 45, 15, 61, 46, 16] + ]; + + /** + * 根据数据获取对应版本 + * @return {[type]} [description] + */ + QRCodeAlg.prototype.getRightType = function () { + for (var typeNumber = 1; typeNumber < 41; typeNumber++) { + var rsBlock = RS_BLOCK_TABLE[(typeNumber - 1) * 4 + this.errorCorrectLevel]; + if (rsBlock == undefined) { + throw new Error("bad rs block @ typeNumber:" + typeNumber + "/errorCorrectLevel:" + this.errorCorrectLevel); + } + var length = rsBlock.length / 3; + var totalDataCount = 0; + for (var i = 0; i < length; i++) { + var count = rsBlock[i * 3 + 0]; + var dataCount = rsBlock[i * 3 + 2]; + totalDataCount += dataCount * count; + } + var lengthBytes = typeNumber > 9 ? 2 : 1; + if (this.utf8bytes.length + lengthBytes < totalDataCount || typeNumber == 40) { + this.typeNumber = typeNumber; + this.rsBlock = rsBlock; + this.totalDataCount = totalDataCount; + break; + } + } + }; + + //--------------------------------------------------------------------- + // QRBitBuffer + //--------------------------------------------------------------------- + function QRBitBuffer() { + this.buffer = new Array(); + this.length = 0; + } + QRBitBuffer.prototype = { + get: function (index) { + var bufIndex = Math.floor(index / 8); + return ((this.buffer[bufIndex] >>> (7 - index % 8)) & 1); + }, + put: function (num, length) { + for (var i = 0; i < length; i++) { + this.putBit(((num >>> (length - i - 1)) & 1)); + } + }, + putBit: function (bit) { + var bufIndex = Math.floor(this.length / 8); + if (this.buffer.length <= bufIndex) { + this.buffer.push(0); + } + if (bit) { + this.buffer[bufIndex] |= (0x80 >>> (this.length % 8)); + } + this.length++; + } + }; + + + + // xzedit + let qrcodeAlgObjCache = []; + /** + * 二维码构造函数，主要用于绘制 + * @param {参数列表} opt 传递参数 + * @return {} + */ + QRCode = function (opt) { + //设置默认参数 + this.options = { + text: '', + size: 256, + correctLevel: 3, + background: '#ffffff', + foreground: '#000000', + pdground: '#000000', + image: '', + imageSize: 30, + canvasId: opt.canvasId, + context: opt.context, + usingComponents: opt.usingComponents, + showLoading: opt.showLoading, + loadingText: opt.loadingText, + }; + if (typeof opt === 'string') { // 只编码ASCII字符串 + opt = { + text: opt + }; + } + if (opt) { + for (var i in opt) { + this.options[i] = opt[i]; + } + } + //使用QRCodeAlg创建二维码结构 + var qrCodeAlg = null; + for (var i = 0, l = qrcodeAlgObjCache.length; i < l; i++) { + if (qrcodeAlgObjCache[i].text == this.options.text && qrcodeAlgObjCache[i].text.correctLevel == this.options.correctLevel) { + qrCodeAlg = qrcodeAlgObjCache[i].obj; + break; + } + } + if (i == l) { + qrCodeAlg = new QRCodeAlg(this.options.text, this.options.correctLevel); + qrcodeAlgObjCache.push({ + text: this.options.text, + correctLevel: this.options.correctLevel, + obj: qrCodeAlg + }); + } + /** + * 计算矩阵点的前景色 + * @param {Obj} config + * @param {Number} config.row 点x坐标 + * @param {Number} config.col 点y坐标 + * @param {Number} config.count 矩阵大小 + * @param {Number} config.options 组件的options + * @return {String} + */ + let getForeGround = function (config) { + var options = config.options; + if (options.pdground && ( + (config.row > 1 && config.row < 5 && config.col > 1 && config.col < 5) || + (config.row > (config.count - 6) && config.row < (config.count - 2) && config.col > 1 && config.col < 5) || + (config.row > 1 && config.row < 5 && config.col > (config.count - 6) && config.col < (config.count - 2)) + )) { + return options.pdground; + } + return options.foreground; + } + // 创建canvas + let createCanvas = function (options) { + if (options.showLoading) { + uni.showLoading({ + title: options.loadingText, + mask: true + }); + } + var ctx = uni.createCanvasContext(options.canvasId, options.context); + var count = qrCodeAlg.getModuleCount(); + var ratioSize = options.size; + var ratioImgSize = options.imageSize; + //计算每个点的长宽 + var tileW = (ratioSize / count).toPrecision(4); + var tileH = (ratioSize / count).toPrecision(4); + //绘制 + for (var row = 0; row < count; row++) { + for (var col = 0; col < count; col++) { + var w = (Math.ceil((col + 1) * tileW) - Math.floor(col * tileW)); + var h = (Math.ceil((row + 1) * tileW) - Math.floor(row * tileW)); + var foreground = getForeGround({ + row: row, + col: col, + count: count, + options: options + }); + ctx.setFillStyle(qrCodeAlg.modules[row][col] ? foreground : options.background); + ctx.fillRect(Math.round(col * tileW), Math.round(row * tileH), w, h); + } + } + if (options.image) { + var x = Number(((ratioSize - ratioImgSize) / 2).toFixed(2)); + var y = Number(((ratioSize - ratioImgSize) / 2).toFixed(2)); + drawRoundedRect(ctx, x, y, ratioImgSize, ratioImgSize, 2, 6, true, true) + ctx.drawImage(options.image, x, y, ratioImgSize, ratioImgSize); + // 画圆角矩形 + function drawRoundedRect(ctxi, x, y, width, height, r, lineWidth, fill, stroke) { + ctxi.setLineWidth(lineWidth); + ctxi.setFillStyle(options.background); + ctxi.setStrokeStyle(options.background); + ctxi.beginPath(); // draw top and top right corner + ctxi.moveTo(x + r, y); + ctxi.arcTo(x + width, y, x + width, y + r, r); // draw right side and bottom right corner + ctxi.arcTo(x + width, y + height, x + width - r, y + height, r); // draw bottom and bottom left corner + ctxi.arcTo(x, y + height, x, y + height - r, r); // draw left and top left corner + ctxi.arcTo(x, y, x + r, y, r); + ctxi.closePath(); + if (fill) { + ctxi.fill(); + } + if (stroke) { + ctxi.stroke(); + } + } + } + setTimeout(() => { + ctx.draw(true, () => { + // 保存到临时区域 + setTimeout(() => { + uni.canvasToTempFilePath({ + width: options.width, + height: options.height, + destWidth: options.width, + destHeight: options.height, + canvasId: options.canvasId, + quality: Number(1), + success: function (res) { + if (options.cbResult) { + options.cbResult(res.tempFilePath) + } + }, + fail: function (res) { + if (options.cbResult) { + options.cbResult(res) + } + }, + complete: function () { + if (options.showLoading){ + uni.hideLoading(); + } + }, + }, options.context); + }, options.text.length + 100); + }); + }, options.usingComponents ? 0 : 150); + } + createCanvas(this.options); + // 空判定 + let empty = function (v) { + let tp = typeof v, + rt = false; + if (tp == "number" && String(v) == "") { + rt = true + } else if (tp == "undefined") { + rt = true + } else if (tp == "object") { + if (JSON.stringify(v) == "{}" || JSON.stringify(v) == "[]" || v == null) rt = true + } else if (tp == "string") { + if (v == "" || v == "undefined" || v == "null" || v == "{}" || v == "[]") rt = true + } else if (tp == "function") { + rt = false + } + return rt + } + }; + QRCode.prototype.clear = function (fn) { + var ctx = uni.createCanvasContext(this.options.canvasId, this.options.context) + ctx.clearRect(0, 0, this.options.size, this.options.size) + ctx.draw(false, () => { + if (fn) { + fn() + } + }) + }; +})() + +export default QRCode \ No newline at end of file diff --git a/pages/active/components/tki-qrcode/tki-qrcode.vue b/pages/active/components/tki-qrcode/tki-qrcode.vue new file mode 100644 index 0000000..2eee5fc --- /dev/null +++ b/pages/active/components/tki-qrcode/tki-qrcode.vue @@ -0,0 +1,211 @@ + + + + diff --git a/pages/active/group-buying/group-buying.vue b/pages/active/group-buying/group-buying.vue new file mode 100644 index 0000000..2bb21b4 --- /dev/null +++ b/pages/active/group-buying/group-buying.vue @@ -0,0 +1,274 @@ + + + + + diff --git a/pages/active/group-detail/group-detail.vue b/pages/active/group-detail/group-detail.vue new file mode 100644 index 0000000..16f05e9 --- /dev/null +++ b/pages/active/group-detail/group-detail.vue @@ -0,0 +1,1229 @@ + + + + + diff --git a/pages/active/static/group_banner_cart.jpg b/pages/active/static/group_banner_cart.jpg new file mode 100644 index 0000000..4344a73 Binary files /dev/null and b/pages/active/static/group_banner_cart.jpg differ diff --git a/pages/home/home.vue b/pages/home/home.vue index 6da519f..dd4171e 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -379,9 +379,9 @@ export default { // #ifdef MP const hasSeenGuide = uni.getStorageSync("has_seen_home_guide"); if (hasSeenGuide) { - uni.showTabBar({ animation: false, fail: () => {} }); + uni.showTabBar({ animation: false, fail: () => { } }); } else { - uni.hideTabBar({ animation: false, fail: () => {} }); + uni.hideTabBar({ animation: false, fail: () => { } }); } // #endif this.refreshKefuUnread(); @@ -720,21 +720,39 @@ export default { let _this = this; uni.getClipboardData({ success: function (res) { - // http://localhost:5173/#/pages/other_package/productInfo/productInfo?id=1038 - console.log(res.data); // 剪贴板内容 - if ( - res.data.indexOf( - `${SHARE_URL}/#/pages/other_package/productInfo/productInfo?id=`, - ) != -1 - ) { + const text = res.data || ""; + console.log('剪贴板内容', text); + const isGroupDetail = text.indexOf("pages/active/group-detail/group-detail") !== -1; + const isProductInfo = text.indexOf("pages/other_package/productInfo/productInfo") !== -1; + const hasShareUrl = (SHARE_URL && text.indexOf(SHARE_URL) !== -1) || + text.indexOf("https://h.tbmall.xin") !== -1 || + text.indexOf("https://h.o.tbmall.xin") !== -1; + + if (isGroupDetail || isProductInfo || hasShareUrl) { uni.showModal({ title: "", content: "当前APP想要粘贴商品详情，是否继续?", success: (res1) => { if (res1.confirm) { - let id = res.data.match(/=(.*?)\s/); - _this.curId = Number(id[1]); - _this.getShop(); + const teamMatch = text.match(/[?&]teamId=([^& \s]+)/); + const teamId = teamMatch ? teamMatch[1] : ""; + const match = text.match(/[?&]id=([^& \s]+)/); + const id = match ? match[1] : ""; + console.log("获取id", id, "teamId", teamId); + + // 识别到了有 teamId，跳转到拼团详情页（展示“参加这个团”场景） + if (teamId) { + uni.navigateTo({ + url: `/pages/active/group-detail/group-detail?teamId=${teamId}&id=${id}`, + }); + } else if (text.indexOf('activedType=groupBuy&activityId=1') !== -1) { + uni.navigateTo({ + url: `/pages/other_package/productInfo/productInfo?id=${id}&activedType=groupBuy&activityId=1`, + }); + } else { + _this.curId = Number(id); + _this.getShop(); + } uni.setClipboardData({ data: "", }); diff --git a/pages/login_package/login/login.vue b/pages/login_package/login/login.vue index 8ecb993..b98db9b 100644 --- a/pages/login_package/login/login.vue +++ b/pages/login_package/login/login.vue @@ -167,7 +167,24 @@ export default { }); // #endif }, - onLoad() { + onLoad(options) { + let redirect = (options && options.redirect) || ""; + // #ifdef H5 + if (!redirect && this.$route && this.$route.query && this.$route.query.redirect) { + redirect = this.$route.query.redirect; + } + // #endif + if (!redirect) { + redirect = uni.getStorageSync("login_redirect_url") || ""; + } + if (redirect) { + try { + this.redirect = decodeURIComponent(redirect); + } catch (e) { + this.redirect = redirect; + } + console.log("登录后重定向目标页面:", this.redirect); + } // #ifdef APP-PLUS // 判断微信是否安装 (iOS 的 scheme 为 weixin://) this.isWechatInstalled = plus.runtime.isApplicationExist({ @@ -201,18 +218,57 @@ export default { loading: false, showPolicyModal: false, isWechatInstalled: false, + redirect: "", }; }, methods: { onBack() { - console.log('onBack',) - uni.switchTab({ - url: '/pages/home/home' - }) + console.log('onBack') + const pages = getCurrentPages(); + if (pages && pages.length > 1) { + uni.navigateBack(); + } else { + uni.switchTab({ + url: '/pages/home/home' + }); + } + }, + + jumpAfterLogin() { + let target = this.redirect || uni.getStorageSync("login_redirect_url") || ""; + uni.removeStorageSync("login_redirect_url"); + if (target) { + try { + if (target.includes("%")) { + target = decodeURIComponent(target); + } + } catch (e) {} + console.log("登录成功，重定向回页面:", target); + uni.redirectTo({ + url: target, + fail: (err) => { + console.warn("redirectTo 失败，尝试 switchTab:", err); + uni.switchTab({ + url: target, + fail: () => { + uni.switchTab({ url: "/pages/home/home" }); + }, + }); + }, + }); + } else { + const pages = getCurrentPages(); + if (pages && pages.length > 1) { + uni.navigateBack(); + } else { + uni.switchTab({ + url: "/pages/home/home", + }); + } + } }, jumpHome() { - uni.switchTab({ url: "/pages/home/home", }); @@ -271,8 +327,8 @@ export default { }); setTimeout(() => { - then.jumpHome(); - }, 2000); + then.jumpAfterLogin(); + }, 1500); }, checkNameParam(val) { // console.log("val",val); @@ -647,9 +703,7 @@ export default { message: response.msg, }); setTimeout(() => { - uni.switchTab({ - url: "/pages/home/home", - }); + this.jumpAfterLogin(); }, 1200); } else if (response && response.msg) { this.$refs.uToastRef.show({ diff --git a/pages/mine_package/apply_refund/apply_refund.vue b/pages/mine_package/apply_refund/apply_refund.vue index bdfc654..69da4de 100644 --- a/pages/mine_package/apply_refund/apply_refund.vue +++ b/pages/mine_package/apply_refund/apply_refund.vue @@ -143,7 +143,7 @@ diff --git a/pages/other_package/productInfo/components/product-contribution-dialog.vue b/pages/other_package/productInfo/components/product-contribution-dialog.vue new file mode 100644 index 0000000..85ed63d --- /dev/null +++ b/pages/other_package/productInfo/components/product-contribution-dialog.vue @@ -0,0 +1,151 @@ + + + + + diff --git a/pages/other_package/productInfo/components/product-coupon-popup.vue b/pages/other_package/productInfo/components/product-coupon-popup.vue new file mode 100644 index 0000000..791597f --- /dev/null +++ b/pages/other_package/productInfo/components/product-coupon-popup.vue @@ -0,0 +1,420 @@ + + + + + diff --git a/pages/other_package/productInfo/components/product-group-rules.vue b/pages/other_package/productInfo/components/product-group-rules.vue new file mode 100644 index 0000000..e162d3f --- /dev/null +++ b/pages/other_package/productInfo/components/product-group-rules.vue @@ -0,0 +1,247 @@ + + + + + diff --git a/pages/other_package/productInfo/components/product-joinable-popup.vue b/pages/other_package/productInfo/components/product-joinable-popup.vue new file mode 100644 index 0000000..5d73794 --- /dev/null +++ b/pages/other_package/productInfo/components/product-joinable-popup.vue @@ -0,0 +1,199 @@ + + + + + diff --git a/pages/other_package/productInfo/productInfo.vue b/pages/other_package/productInfo/productInfo.vue index db41799..8fcd00e 100644 --- a/pages/other_package/productInfo/productInfo.vue +++ b/pages/other_package/productInfo/productInfo.vue @@ -15,21 +15,54 @@ - - - - + + - + + + + + + + + + 拼团价 + ¥ + {{ orderInfo.groupPrice }} + ¥{{ groupOriginPrice }} + + + 只剩 {{ groupCountdownText }} + + + + + + + {{ orderInfo.name }} + + + + + + 下单送{{ orderInfo.contribution }}贡献值 + + + + 全网销量{{ limit999(orderInfo.sales) }} + + - - - + + + --> + + + + 退货提示 @@ -201,15 +239,28 @@ 购物车 - - - 加入购物车 - - - - 立即购买 - + + + + + @@ -263,6 +314,21 @@ +{{ orderInfo.minPrice }}元 + + + 拼团价￥ + + {{ (selectSpecificationTempl && selectSpecificationTempl.groupPrice) ? + selectSpecificationTempl.groupPrice + : orderInfo.groupPrice }} + + + {{ orderInfo.groupSize || 2 }}人团 + + + ￥ @@ -298,8 +364,6 @@ {{ skuBySpecInfo.stock || 0 }}件 --> 已选规格: {{ skuBySpecInfo.skuName }} - - @@ -330,7 +394,12 @@ + - 去支付 + 确定发起拼团 + 确定参与拼团 + 去支付 + 加入购物车 @@ -399,121 +468,25 @@ + :id="id" :text="orderInfo.name ? orderInfo.name : ''" :tu="swiperList.length && swiperList[0]" + :price="isGroupProduct ? String(groupActivityInfo?.groupPrice || orderInfo.price) : String(orderInfo.price || '')" + :groupPrice="groupActivityInfo?.groupPrice ? String(groupActivityInfo.groupPrice) : ''" + :requiredNum="groupActivityInfo?.requiredNum || 2" + :sharePath="isGroupProduct ? `pages/other_package/productInfo/productInfo?id=${id}&activedType=groupBuy&activityId=1` : ''"> + - - - - - 优惠券 - + + - - - - - - - - ¥ - {{ getDiscountAmount(coupon) }} - - {{ getThresholdText(coupon) }} - - - - - - - - - - - - - {{ coupon.title }} - - - {{ getTagText(coupon) }} - - {{ getScopeText(coupon) }} - - {{ getValidityText(coupon) }} - - - - - - 立即领取 - - - 已领取 - - - {{ coupon.receiveStatusText || '已达上限' }} - - - - - - - - - - - 确定 - - - - - - - - - 贡献值说明 - - - - - - - - - 我能获得多少贡献值？ - 1.商品详情页中展示为预估获得贡献值。 - 2.实际赠送的贡献值将根据订单实付金额及商品贡献系数综合计算，其中商品贡献系数由商品毛利等因素确定。 - 3.使用优惠券、发生退款或售后时，贡献值可能相应调整，最终以订单完成后的实际到账为准。 - - - - 生效条件 - 1.收到商品后，在订单中点击【确认收货】时，立马到账。可在【我的-钱包】贡献值进行查看 - 2.消费者权益次日到账，可在【我的-钱包】数字积分-消费者权益中进行查看 - - - - 售后调整 - 1.如发生退货/退款，所有的贡献值、消费者权益将会进行扣除。 - - - - - - - 我知道了 - - - - + + + 0) { + return this.joinableTeamList.map((item, idx) => ({ + id: item.teamId || idx, + teamId: item.teamId, + teamNo: item.teamNo, + nickname: item.leaderName || "拼团团长", + avatar1: item.leaderAvatar || "https://static.tbmall.xin/static/new-home/home_3.png", + avatar2: "https://static.tbmall.xin/static/mine-purse/vcoin_1.png", + countdownText: this.formatTeamCountdown(item), + remainingNum: item.remainingNum, + currentNum: item.currentNum, + requiredNum: item.requiredNum, + virtualLeader: item.virtualLeader, + ...item + })); + } + // fallback: orderInfo 自带的 groupTeamList + if ( + this.orderInfo && + Array.isArray(this.orderInfo.groupTeamList) && + this.orderInfo.groupTeamList.length > 0 + ) { + return this.orderInfo.groupTeamList.map((item, idx) => ({ + id: item.id || item.teamId || idx, + nickname: item.leaderName || item.nickname || item.userName || "拼团团长", + avatar1: item.leaderAvatar || item.avatar1 || item.userAvatar || "https://static.tbmall.xin/static/new-home/home_3.png", + avatar2: item.avatar2 || "https://static.tbmall.xin/static/mine-purse/vcoin_1.png", + countdownText: this.formatTeamCountdown(item), + ...item + })); + } + return []; + }, }, components: { Address, @@ -563,6 +596,10 @@ export default { Evaluation, EvaluateDialog, MyBtn, + ProductCouponPopup, + ProductJoinablePopup, + ProductContributionDialog, + ProductGroupRules, }, data() { return { @@ -571,6 +608,8 @@ export default { addressShow: false, // 收件地址选择 couponPopupShow: false, // 优惠券弹框显示 (图二) contributionTipShow: false, // 贡献值说明弹框显示 + joinablePopupShow: false, // 可直接参加的拼团弹框 + joinableTeamList: [], // 可直接参加的拼团列表 goodsCouponList: [], // 商品可用优惠券列表 evaluateDialogShow: false, // 评价弹框显示 shareOpen: false, @@ -612,28 +651,71 @@ export default { activityId: "", // 秒杀活动ID skuBySpecInfo: {}, detailRich: "", + groupTimer: null, + groupCountdownSeconds: 0, + groupCountdownText: "00:00:00", + groupActivityInfo: null, + currentJoinTeam: null, + fromBuyAlone: false, }; }, onBackPress(options) { - console.log("我是侧滑", options) + console.log("productInfo onBackPress, fromBuyAlone:", this.fromBuyAlone, options); + if (this.fromBuyAlone) { + this.fromBuyAlone = false; + uni.reLaunch({ + url: "/pages/active/group-buying/group-buying?fromBuyAlone=1", + fail: () => { + uni.redirectTo({ + url: "/pages/active/group-buying/group-buying?fromBuyAlone=1", + }); + }, + }); + return true; + } // #ifdef APP-PLUS if (options.from === 'backbutton' && this.isSplash) { - // 1. 阻止默认 pop - plus.webview.currentWebview().canBack = false // 关键句 - uni.reLaunch({ url: '/pages/home/home' }) // 举例：回首页 - return true // 返回 true 即“我处理过了” + plus.webview.currentWebview().canBack = false; + uni.reLaunch({ url: '/pages/home/home' }); + return true; } // #endif }, onLoad(options) { // #ifdef MP-WEIXIN - // 默认禁止小程序右上角的分享菜单 - // uni.hideShareMenu(); + // 微信扫描普通链接二维码打开小程序时，微信会将二维码完整 URL 进行 urlencode 放入 options.q 中 + if (options && options.q) { + try { + const qrUrl = decodeURIComponent(options.q); + console.log("扫码打开小程序 options.q:", qrUrl); + const queryIndex = qrUrl.indexOf("?"); + if (queryIndex !== -1) { + const queryString = qrUrl.slice(queryIndex + 1); + const pairs = queryString.split("&"); + pairs.forEach((pair) => { + if (!pair) return; + const [k, v] = pair.split("="); + if (k) { + options[decodeURIComponent(k)] = v ? decodeURIComponent(v) : ""; + } + }); + } + } catch (e) { + console.error("解析二维码参数 options.q 失败:", e); + } + } // #endif + if (options.fromBuyAlone || options.backToGroupBuying) { + this.fromBuyAlone = true; + } + const id = options.id; this.activedType = options.activedType; this.activityId = options.activityId; + if (options.teamId) { + this.currentJoinTeam = { id: options.teamId }; + } this.isCoupon = options.isPar; if (this.isCoupon && options.curAmount) { @@ -656,7 +738,9 @@ export default { // #ifdef H5 let url = window.location.href; if (url.indexOf(SHARE_URL) != -1) { - this.isShareUrl = true; + // if (this.activedType !== 'groupBuy' && options.activedType !== 'groupBuy') { + // this.isShareUrl = true; + // } } console.log("url", url, SHARE_URL); // #endif @@ -674,23 +758,50 @@ export default { onHide() { timer && clearTimeout(timer); timer = null; + if (this.groupTimer) { + clearInterval(this.groupTimer); + this.groupTimer = null; + } }, onUnload() { timer && clearTimeout(timer); timer = null; + if (this.groupTimer) { + clearInterval(this.groupTimer); + this.groupTimer = null; + } + }, + beforeDestroy() { + if (this.groupTimer) { + clearInterval(this.groupTimer); + this.groupTimer = null; + } + }, + onShow() { + if (this.id && getStorageFun(TOKEN_NAME)) { + this.fetchGoodsCouponList(); + } }, onShareAppMessage(res) { const queryStr = this.buildShareParams(); + let title = this.orderInfo.name || "商品分享"; + if (this.isGroupProduct) { + title = `【拼团抢购】快来和我一起拼团！${this.orderInfo.name || ""}`; + } return { - title: this.orderInfo.name || "商品分享", + title: title, path: `/pages/other_package/productInfo/productInfo?${queryStr}`, imageUrl: (this.swiperList && this.swiperList.length > 0) ? this.swiperList[0] : (this.orderInfo.mainGraph || ""), }; }, onShareTimeline(res) { const queryStr = this.buildShareParams(); + let title = this.orderInfo.name || "商品分享"; + if (this.isGroupProduct) { + title = `【拼团抢购】快来和我一起拼团！${this.orderInfo.name || ""}`; + } return { - title: this.orderInfo.name || "商品分享", + title: title, query: queryStr, imageUrl: (this.swiperList && this.swiperList.length > 0) ? this.swiperList[0] : (this.orderInfo.mainGraph || ""), }; @@ -769,11 +880,76 @@ export default { url: `/pages/rwa_package/kefu/kefu?scene=product&goodsId=${this.id}`, }); }, + getCurrentPagePathWithArgs() { + try { + // #ifdef H5 + if (typeof window !== "undefined" && window.location) { + const hash = window.location.hash || ""; + if (hash) { + const cleanHash = hash.replace(/^#\/?/, "/"); + if (cleanHash && !cleanHash.includes("login_package/login/login")) { + return cleanHash; + } + } + } + // #endif + + const pages = getCurrentPages(); + if (pages && pages.length) { + const cur = pages[pages.length - 1]; + if (cur) { + // #ifdef H5 + if (cur.$route && cur.$route.fullPath && !cur.$route.fullPath.includes("login_package/login/login")) { + return cur.$route.fullPath; + } + // #endif + if (cur.route) { + let path = cur.route.startsWith("/") ? cur.route : "/" + cur.route; + const opts = cur.options || cur.$page?.options || {}; + const qs = Object.keys(opts) + .map((k) => `${k}=${encodeURIComponent(opts[k])}`) + .join("&"); + if (qs) path += "?" + qs; + return path; + } + } + } + } catch (e) { } + let path = `/pages/other_package/productInfo/productInfo?id=${this.id}`; + if (this.isGroupProduct || this.activedType === "groupBuy") { + path += `&activedType=groupBuy&activityId=${this.activityId || 1}`; + } else if (this.activedType === "joinGroup") { + path += `&activedType=joinGroup&activityId=${this.activityId || 1}`; + if (this.currentJoinTeam && this.currentJoinTeam.id) { + path += `&teamId=${this.currentJoinTeam.id}`; + } + } else { + if (this.activedType) path += `&activedType=${this.activedType}`; + if (this.activityId) path += `&activityId=${this.activityId}`; + } + if (this.isCoupon) path += `&isPar=${this.isCoupon}`; + return path; + }, + redirectToLogin() { + const fullPath = this.getCurrentPagePathWithArgs(); + if (fullPath) { + uni.setStorageSync("login_redirect_url", fullPath); + } + const redirectUrl = encodeURIComponent(fullPath); + uni.navigateTo({ + url: `/pages/login_package/login/login?redirect=${redirectUrl}`, + }); + }, buildShareParams() { const params = []; if (this.id) params.push(`id=${this.id}`); - if (this.activedType) params.push(`activedType=${this.activedType}`); - if (this.activityId) params.push(`activityId=${this.activityId}`); + if (this.isGroupProduct || this.activedType === "groupBuy") { + params.push("activedType=groupBuy"); + params.push(`activityId=${this.activityId || 1}`); + } else { + if (this.activedType) params.push(`activedType=${this.activedType}`); + if (this.activityId) params.push(`activityId=${this.activityId}`); + } if (this.isCoupon) params.push(`isPar=${this.isCoupon}`); return params.join("&"); }, @@ -809,6 +985,89 @@ export default { } }, onShare(index) { + if (this.isGroupProduct) { + const targetPath = `/pages/other_package/productInfo/productInfo?id=${this.id}&activedType=groupBuy&activityId=1`; + const targetUrl = `${SHARE_URL}/#${targetPath}`; + const price = this.groupActivityInfo?.groupPrice || this.orderInfo?.price || ""; + const title = `【拼团抢购】快来和我一起拼团！${this.orderInfo?.name || ""}`; + const summary = `【信任桥】邀请好友拼团！${this.orderInfo?.name || ""} 拼团价 ¥${price}`; + const imageUrl = (this.swiperList && this.swiperList.length > 0) ? this.swiperList[0] : (this.orderInfo.mainGraph || ""); + + if (index == 0) { + // #ifdef APP-PLUS + uni.share({ + provider: "weixin", + scene: "WXSceneSession", + type: 5, + imageUrl: imageUrl, + title: title, + miniProgram: { + id: "gh_c31503d62920", + path: targetPath, + type: MINI_PROGRAM_TYPE, + webUrl: targetUrl, + }, + success: () => { + this.onClose(); + }, + fail: (err) => { + console.error("App小程序分享失败，降级为普通网页分享:", err); + uni.share({ + provider: "weixin", + scene: "WXSceneSession", + type: 0, + href: targetUrl, + title: title, + summary: summary, + imageUrl: imageUrl, + complete: () => { + this.onClose(); + }, + }); + }, + }); + // #endif + // #ifdef H5 + uni.setClipboardData({ + data: targetUrl, + success: () => { + uni.showToast({ + title: "拼团链接已复制，请发送给微信好友", + icon: "none", + }); + }, + }); + this.onClose(); + // #endif + return; + } else if (index == 1) { + // #ifdef APP-PLUS + uni.share({ + provider: "weixin", + scene: "WXSceneTimeline", + type: 0, + href: targetUrl, + title: title, + summary: summary, + imageUrl: imageUrl, + }); + // #endif + // #ifdef H5 + uni.setClipboardData({ + data: targetUrl, + success: () => { + uni.showToast({ + title: "拼团链接已复制，去分享到朋友圈吧", + icon: "none", + }); + }, + }); + // #endif + this.onClose(); + return; + } + } + let tmp = `【信任桥】消费共享数字化权益　${SHARE_URL}/#/pages/other_package/productInfo/productInfo?id=${this.id} ${this.orderInfo.name}`; if (index == 0) { // WXSceneTimeline @@ -845,9 +1104,6 @@ export default { async onDraw() { let _this = this; try { - let last; - // qsc.setRect({ x: 0, y: 0,r:12, height: 960, width: 620}); - qsc.setPaintbrush({ strokeStyle: "#EBEBEB", font: { @@ -870,14 +1126,6 @@ export default { width: 62, }); - // last = await qsc.drawImg({ - // val:'https://niu8.letaocm.top/17557729915067836.jpg', - // x: 20, - // y: 20, - // height: 270, - // width: 270, - // }) - // #ifndef H5 last = await qsc.drawImg({ val: _this.swiperList[0], @@ -1097,6 +1345,22 @@ export default { this.openShow = false; }, jumpLeft() { + console.log("productInfo jumpLeft called, fromBuyAlone:", this.fromBuyAlone); + // 如果是从拼团详情“单独购买”弹窗跳转过来的，返回时直达拼团列表 + if (this.fromBuyAlone) { + this.fromBuyAlone = false; + uni.reLaunch({ + url: "/pages/active/group-buying/group-buying?fromBuyAlone=1", + fail: (err) => { + console.error("reLaunch failed, fallback to redirectTo:", err); + uni.redirectTo({ + url: "/pages/active/group-buying/group-buying?fromBuyAlone=1", + }); + }, + }); + return; + } + const pages = getCurrentPages(); // 如果是从分享链接直接打开（页面栈数量 <= 1）或闪屏/引导打开，点击返回直接回到首页 if (this.isSplash == "true" || pages.length <= 1) { @@ -1149,6 +1413,13 @@ export default { params.activityId = this.activityId; params.activityType = 'seckill'; } + + if (this.activedType === 'groupBuy' || this.activedType === 'joinGroup') { + params.activityId = this.activityId; + params.type = 5; + } + + const resp = await getGoodsDetail(params); if (resp && resp.bizcode === 100) { const data = resp.data; @@ -1171,13 +1442,159 @@ export default { console.log("查询详细内容---", data) this.orderInfo = data; + if (data.groupPrice !== undefined && data.groupPrice !== null && data.groupPrice !== "") { + this.fetchGroupBuyCurrent(data); + this.fetchJoinableList(); + } this.detailRich = this.orderInfo.detailInfo.replace( /]*?)>/gi, '' ); - this.fetchGoodsCouponList(); + if (getStorageFun(TOKEN_NAME)) { + this.fetchGoodsCouponList(); + } } }, + onJoinTeam(team) { + this.currentJoinTeam = team; + this.checkSpecification(true, "joinGroup"); + }, + // 打开"可直接参与的拼团"弹窗，同时拉取列表 + openJoinablePopup() { + this.joinablePopupShow = true; + this.fetchJoinableList(); + }, + // 拉取可参与拼团列表 + async fetchJoinableList() { + try { + const params = { goodsId: this.id }; + if (this.activityId) params.activityId = this.activityId; + const res = await getGroupBuyJoinableList(params); + if (res && res.bizcode === 100 && Array.isArray(res.data)) { + this.joinableTeamList = res.data; + } else { + this.joinableTeamList = []; + } + } catch (e) { + console.error("fetchJoinableList error:", e); + this.joinableTeamList = []; + } + }, + // 格式化拼团倒计时文本，如 "12:17后结束" + formatTeamCountdown(item) { + let seconds = 0; + if (item.remainingSeconds !== undefined && item.remainingSeconds !== null) { + seconds = Number(item.remainingSeconds); + } else if (item.expireTime) { + seconds = Math.floor((Number(item.expireTime) - Date.now()) / 1000); + } + if (seconds <= 0) return "已结束"; + const h = Math.floor(seconds / 3600); + const m = Math.floor((seconds % 3600) / 60); + const s = seconds % 60; + if (h > 0) { + return `${String(h).padStart(2, "0")}:${String(m).padStart(2, "0")}:${String(s).padStart(2, "0")}后结束`; + } + return `${String(m).padStart(2, "0")}:${String(s).padStart(2, "0")}后结束`; + }, + // 从弹窗中点击"去拼团" + onJoinTeamFromPopup(team) { + this.joinablePopupShow = false; + this.currentJoinTeam = team; + this.$nextTick(() => { + this.checkSpecification(true, "joinGroup"); + }); + }, + + // 从 /groupBuy/current/0910 接口获取当前拼团活动（startTime, endTime, remainingSeconds等） + async fetchGroupBuyCurrent(fallbackData) { + try { + const params = {}; + if (this.id) params.goodsId = this.id; + if (this.activityId) params.activityId = this.activityId; + const res = await getGroupBuyCurrent(params); + if (res && res.bizcode === 100 && res.data) { + const actData = res.data; + this.groupActivityInfo = actData; + if (actData.activityId && !this.activityId) { + this.activityId = actData.activityId; + } + if (actData.groupSize && this.orderInfo) { + this.$set(this.orderInfo, "groupSize", actData.groupSize); + } + this.initGroupCountdown(actData); + return; + } + } catch (e) { + console.error("fetchGroupBuyCurrent error:", e); + } + if (fallbackData) { + this.initGroupCountdown(fallbackData); + } + }, + + initGroupCountdown(data) { + if (this.groupTimer) { + clearInterval(this.groupTimer); + this.groupTimer = null; + } + if (!data) { + this.groupCountdownSeconds = 0; + this.groupCountdownText = "00:00:00"; + return; + } + + let remaining = 0; + const now = Date.now(); + // 支持 13位毫秒时间戳 endTime / expireTime / activityEndTime + const endTime = data.endTime + ? Number(data.endTime) + : data.expireTime + ? Number(data.expireTime) + : data.activityEndTime + ? Number(data.activityEndTime) + : data.activity?.endTime + ? Number(data.activity.endTime) + : 0; + + if (endTime > 0) { + // 使用 13位毫秒时间戳计算精确剩余秒数 + remaining = Math.floor((endTime - now) / 1000); + } else if (data.remainingSeconds !== undefined && data.remainingSeconds !== null) { + remaining = Number(data.remainingSeconds); + } else if (data.activity?.remainingSeconds !== undefined && data.activity?.remainingSeconds !== null) { + remaining = Number(data.activity.remainingSeconds); + } else { + remaining = 0; + } + + this.groupCountdownSeconds = remaining > 0 ? remaining : 0; + this.updateGroupCountdownText(); + + if (this.groupCountdownSeconds > 0) { + this.groupTimer = setInterval(() => { + this.groupCountdownSeconds--; + if (this.groupCountdownSeconds <= 0) { + this.groupCountdownSeconds = 0; + this.groupCountdownText = "00:00:00"; + clearInterval(this.groupTimer); + this.groupTimer = null; + } else { + this.updateGroupCountdownText(); + } + }, 1000); + } else { + this.groupCountdownText = "00:00:00"; + } + }, + updateGroupCountdownText() { + const s = this.groupCountdownSeconds; + const hours = Math.floor(s / 3600); + const minutes = Math.floor((s % 3600) / 60); + const seconds = s % 60; + const pad = (num) => String(num).padStart(2, "0"); + this.groupCountdownText = `${pad(hours)}:${pad(minutes)}:${pad(seconds)}`; + }, /** * 来自商城的订单 */ @@ -1237,6 +1654,10 @@ export default { if (this.isShareUrl) { return; } + if (val && type !== "n" && !getStorageFun(TOKEN_NAME)) { + this.redirectToLogin(); + return; + } const source = this.source; if (type == "n" && (this.isShowCart == 1 || this.isCoupon)) { type = "buy"; @@ -1274,6 +1695,11 @@ export default { params.activityId = this.activityId; params.activityType = 'seckill'; } + + if (this.activedType === 'groupBuy' || this.activedType === 'joinGroup') { + params.type = 5; + } + try { infoResp = await getGoodsSpecsInfo(params); } catch (e) { @@ -1410,6 +1836,7 @@ export default { if (this.selectedSpecValueIds.every((id) => id != null)) { const currentSelectSpecification = this.skuBySpecKey[this.selectedSpecValueIds.join("_")] || {}; + console.log("----333", currentSelectSpecification, this.skuBySpecKey, this.selectedSpecValueIds) this.selectSpecificationTempl = currentSelectSpecification; this.orderInfo.quantity = currentSelectSpecification.minBuyNum || 1; this.orderInfo.inventory = currentSelectSpecification.stock || 0; @@ -1482,6 +1909,10 @@ export default { // 加入购入车 async addCart(isBy = false) { + if (!getStorageFun(TOKEN_NAME)) { + this.redirectToLogin(); + return; + } const selectTempl = this.selectSpecificationTempl; if (!selectTempl || Object.keys(selectTempl).length === 0) { uni.showToast({ @@ -1511,9 +1942,29 @@ export default { goodsNum: this.orderInfo.quantity, // 商品数量 }; - console.log("selectTempl", selectTempl); - if (this.isShowCart == 1 || this.isCoupon) { - console.log("活动类型params---秦星星", params, this.isCoupon, this.isShowCart == 1); + const isGroupAction = Boolean( + this.isGroupProduct && + (this.specificationShowType === "groupBuy" || + this.specificationShowType === "joinGroup" || + this.activedType === "group") + ); + if (this.isShowCart == 1 || this.isCoupon || isGroupAction) { + delete selectTempl.skuImage; + delete selectTempl.specValueIds; + delete selectTempl.activityGoodsId; + delete selectTempl.skuName; + delete selectTempl.legacyName; + delete selectTempl.combTypes; + delete selectTempl.specValuePath; + + Object.keys(selectTempl).forEach((key) => { + if (selectTempl[key] === null) { + delete selectTempl[key]; + } + }); + + console.log('selectTempl', selectTempl) + params["specsId"] = selectTempl; let url = ""; if (this.activedType == "seckill") { @@ -1530,14 +1981,25 @@ export default { )}&address=${this.selectAddress?.id}&isCoupon=${this.isCoupon}` } + if (isGroupAction) { + params["activedType"] = this.specificationShowType || "group"; + params["activityId"] = this.orderInfo.activityId || this.activityId || ""; + params["activityGoodsId"] = this.orderInfo.activityGoodsId || ""; + params["groupPrice"] = this.orderInfo.groupPrice; + if (this.currentJoinTeam && this.currentJoinTeam.id) { + params["teamId"] = this.currentJoinTeam.id; + } + console.log("我是--111", params) + + url = `/pages/order_package/order_submit/order_submit?sed=${JSON.stringify(params)}&address=${this.selectAddress?.id}`; + } + if (!url) { url = `/pages/order_package/order_submit/order_submit?sed=${JSON.stringify( params )}&address=${this.selectAddress?.id}`; - this.specificationShow = false; } - - console.log("活动类型params---秦星星--1", url); + this.specificationShow = false; uni.navigateTo({ url: url @@ -1574,7 +2036,7 @@ export default { }, // 获取商品优惠券列表 async fetchGoodsCouponList() { - if (!this.id) return; + if (!this.id || !getStorageFun(TOKEN_NAME)) return; try { const res = await getGoodsCouponList({ goodsId: this.id, payway2: this.orderInfo.buyDeductionValue ? 'vcion' : null }); if (res && res.bizcode === 100) { @@ -1611,65 +2073,6 @@ export default { }); } }, - getDiscountAmount(coupon) { - return coupon.discountAmount !== undefined ? coupon.discountAmount : (coupon.amount || 0); - }, - getThresholdText(coupon) { - const threshold = coupon.thresholdAmount !== undefined ? Number(coupon.thresholdAmount) : 0; - if (threshold === 0) { - return "无门槛"; - } - return `满${threshold}元可用`; - }, - getTagText(coupon) { - if (coupon.scopeType === 1) return "通用券"; - if (coupon.scopeType === 2) return "商品券"; - if (coupon.scopeType === 3 || coupon.scopeType === 4) return "品类券"; - if (coupon.scopeText && coupon.scopeText.includes("通用")) return "通用券"; - return "通用券"; - }, - getScopeText(coupon) { - if (coupon.scopeText) return coupon.scopeText; - if (coupon.scopeType === 1) return "所有商品可用"; - if (coupon.scopeType === 2) return "指定商品可用"; - if (coupon.scopeType === 3) return "指定类目可用"; - if (coupon.scopeType === 4) return "指定专区商品可用"; - return "所有商品可用"; - }, - getValidityText(coupon) { - if (coupon.validDays && coupon.validDays > 0) { - return `领取之日起${coupon.validDays}天内有效`; - } - if (coupon.useEndTime) { - return `有效期至 ${this.formatTime(coupon.useEndTime)}`; - } - if (coupon.receiveEndTime) { - return `截止时间 ${this.formatTime(coupon.receiveEndTime)}`; - } - return "领取之日起30天内有效"; - }, - getCardReceived(coupon) { - return coupon.received || coupon.receiveStatus === 1; - }, - getCouponCanReceive(coupon) { - return coupon.canReceive !== false && coupon.receiveStatus !== 2; - }, - getCardDisabled(coupon) { - return coupon.receiveStatus === 2 || (coupon.canReceive === false && !coupon.received && coupon.receiveStatus !== 1); - }, - formatTime(time) { - if (!time) return ""; - if (typeof time === "string" && time.includes("-")) return time; - const date = new Date(Number(time)); - if (isNaN(date.getTime())) return String(time); - const y = date.getFullYear(); - const m = String(date.getMonth() + 1).padStart(2, "0"); - const d = String(date.getDate()).padStart(2, "0"); - const hh = String(date.getHours()).padStart(2, "0"); - const mm = String(date.getMinutes()).padStart(2, "0"); - const ss = String(date.getSeconds()).padStart(2, "0"); - return `${y}-${m}-${d} ${hh}:${mm}:${ss}`; - }, }, }; @@ -1716,6 +2119,8 @@ export default { .img_comm { position: absolute; top: 170rpx; + z-index: 100; + cursor: pointer; } .left_warp { @@ -1725,18 +2130,153 @@ export default { .right_warp { right: 40rpx; } + + // 拼团专属商品卡片 - 绝对定位悬浮在轮播图底部 + .group_product_card { + position: absolute; + bottom: -190rpx; + left: 20rpx; + right: 20rpx; + z-index: 10; + background: #ffffff; + border-radius: 24rpx; + overflow: hidden; + box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.08); + + .group_price_bar { + display: flex; + align-items: center; + justify-content: space-between; + background: linear-gradient(90deg, #7433f6 0%, #b34ef7 100%); + padding: 0 28rpx; + height: 104rpx; + box-sizing: border-box; + + .group_price_left { + display: flex; + align-items: baseline; + + .group_price_label { + color: #ffffff; + font-size: 28rpx; + font-weight: 500; + margin-right: 6rpx; + } + + .group_price_symbol { + color: #ffffff; + font-size: 30rpx; + font-weight: bold; + margin-right: 4rpx; + } + + .group_price_int { + color: #ffffff; + font-size: 60rpx; + font-weight: 900; + line-height: 1; + } + + + .group_price_origin { + color: rgba(255, 255, 255, 0.75); + font-size: 26rpx; + text-decoration: line-through; + margin-left: 20rpx; + font-weight: normal; + } + } + + .group_price_right { + .group_remaining_text { + color: #ffffff; + font-size: 26rpx; + font-weight: 500; + letter-spacing: 1rpx; + } + } + } + + .group_card_body { + padding: 24rpx 24rpx 28rpx 24rpx; + + .content_data_title { + font-weight: bold; + font-size: 34rpx; + color: #1a1a1a; + line-height: 48rpx; + margin-top: 0; + margin-bottom: 24rpx; + } + + .group_series_row { + display: flex; + justify-content: space-between; + align-items: center; + + .group_series_left { + display: flex; + align-items: center; + + .group_contribution_pill { + display: inline-flex; + align-items: center; + background: #f4ebfe; + border: 1rpx solid #e1cefc; + border-radius: 8rpx; + padding: 6rpx 14rpx; + + .contribution_icon { + width: 30rpx; + height: 30rpx; + margin-right: 8rpx; + } + + .contribution_text { + font-size: 24rpx; + font-weight: 500; + color: #7934f6; + line-height: 1; + } + } + + .group_tips_icon { + width: 32rpx; + height: 32rpx; + margin-left: 14rpx; + } + } + + .group_sales_count { + font-size: 24rpx; + color: #999999; + font-weight: normal; + } + } + } + } } .product_content_warp { // background: linear-gradient(0deg, #F9F9F9 0%, #FFFFFF 100%); border-radius: 30rpx 30rpx 0rpx 24rpx; padding: 20rpx; + overflow: hidden; + + &.group_content_warp { + padding-top: 210rpx; + + .content_concrete { + margin-top: 0; + } + } .content_data { padding: 20rpx; } .content_data_price { + font-weight: bold; font-size: 36rpx; color: $app-bt-bj; @@ -1805,6 +2345,8 @@ export default { .buy_deduction_label { font-size: 24rpx; color: #E88900; + display: flex; + align-items: center; } } } @@ -1945,6 +2487,7 @@ export default { } .content_details { + background: #ffffff; border-radius: 24rpx; padding: 10rpx 10rpx 30rpx; @@ -2024,6 +2567,11 @@ export default { } } +.group_popup_buy_btn { + background: linear-gradient(90deg, #8a3bf8 0%, #742af5 100%) !important; + color: #ffffff !important; +} + .specification_warp { background-color: $app-bj; @@ -2357,373 +2905,4 @@ export default { flex-shrink: 0; } } - -/* 领券弹窗组件 (图二高保真) */ -.goods_coupon_popup_container { - width: 100%; - max-width: 100vw; - background-color: #ffffff; - border-radius: 32rpx 32rpx 0 0; - padding: 32rpx 24rpx 40rpx 24rpx; - box-sizing: border-box; - display: flex; - flex-direction: column; - overflow: hidden; - - .popup_header { - position: relative; - text-align: center; - margin-bottom: 24rpx; - - .popup_title { - font-size: 32rpx; - font-weight: bold; - color: #333333; - } - } - - .popup_coupon_scroll { - width: 100%; - max-width: 100%; - box-sizing: border-box; - max-height: 700rpx; - min-height: 300rpx; - - .popup_coupon_list { - width: 100%; - max-width: 100%; - box-sizing: border-box; - padding: 8rpx 0; - } - } - - .popup_bottom_btn_wrap { - margin-top: 24rpx; - padding: 0 16rpx; - - .popup_btn_ok { - width: 100%; - height: 84rpx; - line-height: 84rpx; - text-align: center; - background: linear-gradient(135deg, #a855f7 0%, #7a35f6 100%); - color: #ffffff; - font-size: 30rpx; - font-weight: bold; - border-radius: 42rpx; - box-shadow: 0 8rpx 20rpx rgba(122, 53, 246, 0.25); - transition: transform 0.1s ease; - - &:active { - transform: scale(0.98); - } - } - } - - /* 弹窗内的优惠券卡片高保真样式 */ - .coupon-card { - position: relative; - width: 100%; - max-width: 100%; - display: flex; - align-items: center; - background: rgba(253, 28, 36, 0.06); - border-radius: 16rpx; - margin-bottom: 20rpx; - box-sizing: border-box; - overflow: hidden; - - &.card-disabled { - background: #f5f5f5 !important; - - .card-left { - .price-box { - color: #a0a0a0 !important; - } - - .condition { - color: #999999 !important; - } - } - - .coupon-title { - color: #333333 !important; - } - } - - .card-left { - width: 150rpx; - flex-shrink: 0; - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - padding: 20rpx 0; - - .price-box { - display: flex; - align-items: baseline; - color: #ff2442; - - .currency { - font-size: 26rpx; - font-weight: bold; - margin-right: 2rpx; - } - - .amount { - font-size: 52rpx; - font-weight: 700; - line-height: 1; - } - } - - .condition { - font-size: 24rpx; - color: #ff2442; - margin-top: 10rpx; - font-weight: 500; - } - } - - .divider-wrapper { - position: relative; - width: 2rpx; - align-self: stretch; - - .divider-line { - height: 100%; - border-left: 2rpx dashed #fca5a5; - } - - .notch { - position: absolute; - left: 50%; - transform: translateX(-50%); - width: 24rpx; - height: 24rpx; - background-color: #ffffff; - border-radius: 50%; - z-index: 10; - } - - .top-notch { - top: -12rpx; - } - - .bottom-notch { - bottom: -12rpx; - } - } - - .card-disabled .divider-line { - border-left: 2rpx dashed #dddddd !important; - } - - .card-right { - flex: 1; - min-width: 0; - display: flex; - align-items: center; - justify-content: space-between; - padding: 20rpx 16rpx; - box-sizing: border-box; - - .info-content { - flex: 1; - min-width: 0; - margin-right: 10rpx; - overflow: hidden; - - .coupon-title { - font-size: 30rpx; - font-weight: bold; - color: #1a1a1a; - margin-bottom: 10rpx; - line-height: 1.2; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - } - - .tag-row { - display: flex; - align-items: center; - margin-bottom: 10rpx; - min-width: 0; - overflow: hidden; - - .coupon-tag { - display: inline-block; - font-size: 20rpx; - color: #ff2442; - background: #ffe4e6; - border: 1px solid #ff99a4; - border-radius: 6rpx; - padding: 2rpx 10rpx; - margin-right: 10rpx; - line-height: 1.2; - font-weight: 500; - flex-shrink: 0; - white-space: nowrap; - - &.tag-disabled { - color: #888888 !important; - background: #eeeeee !important; - border: 1px solid #cccccc !important; - } - } - - .coupon-scope { - flex: 1; - min-width: 0; - font-size: 22rpx; - color: #666666; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - } - } - - .coupon-validity { - font-size: 22rpx; - color: #999999; - line-height: 1.2; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - } - } - - .btn-box { - flex-shrink: 0; - - .action-btn { - width: 124rpx; - height: 54rpx; - line-height: 54rpx; - text-align: center; - font-size: 24rpx; - font-weight: bold; - border-radius: 8rpx; - box-sizing: border-box; - flex-shrink: 0; - - &.btn-claim { - background: #ff1e38; - color: #ffffff; - } - - &.btn-received { - background: #ffe8eb; - color: #ff2442; - border: 1px solid #ff4d5e; - line-height: 52rpx; - font-weight: 500; - } - - &.btn-disabled { - background: #eeeeee; - color: #bbbbbb; - } - } - } - } - } -} - -/* 贡献值说明弹窗高保真样式 */ -.contribution_popup_container { - background: #ffffff; - border-radius: 32rpx 32rpx 0 0; - display: flex; - flex-direction: column; - max-height: 80vh; - box-sizing: border-box; - - .contribution_popup_header { - display: flex; - justify-content: center; - align-items: center; - position: relative; - padding: 32rpx 32rpx 16rpx; - - .contribution_header_title { - font-weight: 500; - font-size: 32rpx; - color: #71737c; - } - - .contribution_header_close { - position: absolute; - right: 32rpx; - top: 28rpx; - width: 48rpx; - height: 48rpx; - display: flex; - align-items: center; - justify-content: center; - cursor: pointer; - } - } - - .contribution_popup_body { - max-height: 60vh; - padding: 10rpx 36rpx 20rpx; - box-sizing: border-box; - - .contribution_section { - margin-bottom: 28rpx; - - &:last-child { - margin-bottom: 10rpx; - } - - .contribution_section_title { - font-size: 34rpx; - font-weight: bold; - color: #111111; - margin-bottom: 20rpx; - line-height: 1.4; - } - - .contribution_text { - font-size: 28rpx; - line-height: 1.75; - color: #666666; - margin-bottom: 16rpx; - - &:last-child { - margin-bottom: 0; - } - } - } - } - - .contribution_popup_footer { - padding: 20rpx 36rpx; - padding-bottom: calc(24rpx + env(safe-area-inset-bottom)); - background: #ffffff; - box-sizing: border-box; - - .contribution_btn_confirm { - width: 100%; - height: 88rpx; - background: #7934f6; - border-radius: 16rpx; - display: flex; - align-items: center; - justify-content: center; - font-size: 32rpx; - color: #ffffff; - font-weight: 500; - cursor: pointer; - transition: opacity 0.15s ease; - - &:active { - opacity: 0.85; - } - } - } -} \ No newline at end of file diff --git a/static/common/waybill.png b/static/common/waybill.png new file mode 100644 index 0000000..863a5f4 Binary files /dev/null and b/static/common/waybill.png differ diff --git a/uni_modules/tb-douyin-pay/utssdk/app-android/TbDouyinPayNative.kt b/uni_modules/tb-douyin-pay/utssdk/app-android/TbDouyinPayNative.kt index 26c53ac..553b04f 100644 --- a/uni_modules/tb-douyin-pay/utssdk/app-android/TbDouyinPayNative.kt +++ b/uni_modules/tb-douyin-pay/utssdk/app-android/TbDouyinPayNative.kt @@ -1,20 +1,61 @@ package uts.sdk.modules.tbDouyinPay +import android.app.Activity import android.os.Handler import android.os.Looper -import com.ss.android.dypay.api.DyPay -import com.ss.android.dypay.api.IDyPayResultCallback import io.dcloud.uts.UTSAndroid import org.json.JSONObject +import java.lang.reflect.Proxy object TbDouyinPayNative { private val main = Handler(Looper.getMainLooper()) + private const val DYPAY_CLASS_NAME = "com.ss.android.dypay.api.DyPay" + private const val CALLBACK_CLASS_NAME = "com.ss.android.dypay.api.IDyPayResultCallback" - fun initialize(appId: String) { DyPay.setAppId(appId) } + private fun getDyPayClass(): Class<*>? { + return try { + Class.forName(DYPAY_CLASS_NAME) + } catch (_: Throwable) { + null + } + } + + fun initialize(appId: String) { + try { + val clazz = getDyPayClass() ?: return + val method = clazz.methods.firstOrNull { it.name == "setAppId" && it.parameterTypes.size == 1 } + method?.invoke(null, appId) + } catch (_: Throwable) { + } + } fun available(): Boolean { val activity = UTSAndroid.getUniActivity() ?: return false - return DyPay.isDypayAppUsable(activity) + try { + val clazz = getDyPayClass() + if (clazz != null) { + val method = clazz.methods.firstOrNull { it.name == "isDypayAppUsable" && it.parameterTypes.size == 1 } + if (method != null) { + val res = method.invoke(null, activity) + if (res is Boolean) return res + } + } + } catch (_: Throwable) { + } + + return try { + val pm = activity.packageManager + pm.getPackageInfo("com.ss.android.ugc.aweme", 0) + true + } catch (_: Throwable) { + try { + val pm = activity.packageManager + pm.getPackageInfo("com.ss.android.ugc.aweme.lite", 0) + true + } catch (_: Throwable) { + false + } + } } fun pay(payload: String, loading: Boolean, done: (String) -> Unit) { @@ -25,26 +66,81 @@ object TbDouyinPayNative { return@post } try { - if (!DyPay.isDypayAppUsable(activity)) { + val dyPayClass = getDyPayClass() + if (dyPayClass == null) { + done("""{"resultCode":"2","errorMsg":"支付 SDK 调用异常，请查询订单"}""") + return@post + } + + val isUsableMethod = dyPayClass.methods.firstOrNull { it.name == "isDypayAppUsable" && it.parameterTypes.size == 1 } + val isUsable = (isUsableMethod?.invoke(null, activity) as? Boolean) ?: false + if (!isUsable) { done("""{"resultCode":"100","errorMsg":"请安装或升级抖音客户端"}""") return@post } + val json = JSONObject(payload) val data = HashMap() for (key in listOf("appid", "partnerid", "prepayid", "package", "noncestr", "timestamp", "sign")) { - data[key] = json.getString(key) + if (json.has(key)) { + data[key] = json.getString(key) + } } - DyPay(activity).pay(data, object : IDyPayResultCallback { - override fun onResult(result: Map) { + + val callbackClass = try { + Class.forName(CALLBACK_CLASS_NAME) + } catch (_: Throwable) { + null + } + + if (callbackClass == null) { + done("""{"resultCode":"2","errorMsg":"支付 SDK 调用异常，请查询订单"}""") + return@post + } + + val callbackProxy = Proxy.newProxyInstance( + callbackClass.classLoader ?: activity.classLoader, + arrayOf(callbackClass) + ) { _, method, args -> + if (method.name == "onResult" && args != null && args.isNotEmpty()) { + @Suppress("UNCHECKED_CAST") + val result = args[0] as? Map + val resultCode = result?.get("resultCode")?.toString() ?: "3" + val errorMsg = result?.get("errorMsg")?.toString() ?: "" val response = JSONObject() - .put("resultCode", result["resultCode"] ?: "3") - .put("errorMsg", result["errorMsg"] ?: "") + .put("resultCode", resultCode) + .put("errorMsg", errorMsg) main.post { done(response.toString()) } } - }, loading) - } catch (_: Exception) { + null + } + + val constructor = dyPayClass.constructors.firstOrNull { + it.parameterTypes.size == 1 && Activity::class.java.isAssignableFrom(it.parameterTypes[0]) + } ?: dyPayClass.getConstructor(Activity::class.java) + + val dyPayInstance = constructor.newInstance(activity) + + val payMethod = dyPayClass.methods.firstOrNull { + it.name == "pay" && it.parameterTypes.size == 3 + } ?: dyPayClass.methods.firstOrNull { + it.name == "pay" && it.parameterTypes.size == 2 + } + + if (payMethod == null) { + done("""{"resultCode":"2","errorMsg":"支付 SDK 调用异常，请查询订单"}""") + return@post + } + + if (payMethod.parameterTypes.size == 3) { + payMethod.invoke(dyPayInstance, data, callbackProxy, loading) + } else { + payMethod.invoke(dyPayInstance, data, callbackProxy) + } + } catch (_: Throwable) { done("""{"resultCode":"2","errorMsg":"支付 SDK 调用异常，请查询订单"}""") } } } } + diff --git a/uni_modules/uni-requestMerchantTransfer/utssdk/app-android/RequestMerchantTransferNative.kt b/uni_modules/uni-requestMerchantTransfer/utssdk/app-android/RequestMerchantTransferNative.kt new file mode 100644 index 0000000..f12fb2d --- /dev/null +++ b/uni_modules/uni-requestMerchantTransfer/utssdk/app-android/RequestMerchantTransferNative.kt @@ -0,0 +1,114 @@ +package uts.sdk.modules.uniRequestMerchantTransfer + +import android.content.Context +import io.dcloud.uts.UTSAndroid +import java.net.URLEncoder +import java.nio.charset.StandardCharsets + +object RequestMerchantTransferNative { + private const val OPEN_BUSINESS_VIEW_SDK_INT = 0x25020500 + + fun send( + appId: String?, + mchId: String, + packageValue: String, + openId: String?, + subAppId: String?, + subMchId: String?, + done: (Boolean, String) -> Unit + ) { + val context = UTSAndroid.getAppContext() + if (context == null) { + done(false, "当前应用上下文不可用") + return + } + + try { + val factoryClass = try { + Class.forName("com.tencent.mm.opensdk.openapi.WXAPIFactory") + } catch (_: Throwable) { + null + } + + if (factoryClass == null) { + done(false, "未集成微信 OpenSDK，请使用自定义基座或打包运行") + return + } + + val createMethod = factoryClass.getMethod( + "createWXAPI", + Context::class.java, + String::class.java, + Boolean::class.javaPrimitiveType + ) + val api = createMethod.invoke(null, context, appId, false) + if (api == null) { + done(false, "微信 API 初始化失败") + return + } + + val apiClass = api.javaClass + val getApiVersionMethod = apiClass.methods.firstOrNull { + it.name == "getWxAppSupportAPI" || it.name == "getWXAppSupportAPI" + } + val wxSdkVersion = (getApiVersionMethod?.invoke(api) as? Number)?.toInt() ?: 0 + + var requiredSdkVersion = OPEN_BUSINESS_VIEW_SDK_INT + try { + val buildClass = Class.forName("com.tencent.mm.opensdk.constants.Build") + val field = buildClass.getField("OPEN_BUSINESS_VIEW_SDK_INT") + requiredSdkVersion = field.getInt(null) + } catch (_: Throwable) { + } + + if (wxSdkVersion < requiredSdkVersion) { + done(false, "当前微信版本过低，请升级微信以使用该功能") + return + } + + fun encode(v: String?): String { + return if (v != null) URLEncoder.encode(v, StandardCharsets.UTF_8.name()) else "" + } + + val queryBuilder = StringBuilder() + queryBuilder.append("mchId=").append(encode(mchId)).append("&") + queryBuilder.append("package=").append(encode(packageValue)).append("&") + if (appId != null) { + queryBuilder.append("appId=").append(encode(appId)).append("&") + } + if (openId != null) { + queryBuilder.append("openId=").append(encode(openId)).append("&") + } + if (subAppId != null) { + queryBuilder.append("subAppId=").append(encode(subAppId)).append("&") + } + if (subMchId != null) { + queryBuilder.append("subMchId=").append(encode(subMchId)).append("&") + } + val queryString = if (queryBuilder.isNotEmpty() && queryBuilder.endsWith("&")) { + queryBuilder.substring(0, queryBuilder.length - 1) + } else { + queryBuilder.toString() + } + + val reqClass = Class.forName("com.tencent.mm.opensdk.modelbiz.WXOpenBusinessView\$Req") + val reqInstance = reqClass.getDeclaredConstructor().newInstance() + + reqClass.getField("businessType").set(reqInstance, "requestMerchantTransfer") + reqClass.getField("query").set(reqInstance, queryString) + + val sendReqMethod = apiClass.methods.firstOrNull { + it.name == "sendReq" && it.parameterTypes.size == 1 + } + + val ret = (sendReqMethod?.invoke(api, reqInstance) as? Boolean) ?: false + if (ret) { + done(true, "ok") + } else { + done(false, "fail") + } + } catch (e: Throwable) { + done(false, "调用微信转账接口异常: " + (e.message ?: "")) + } + } +} diff --git a/uni_modules/uni-requestMerchantTransfer/utssdk/app-android/index.uts b/uni_modules/uni-requestMerchantTransfer/utssdk/app-android/index.uts index 52c251f..743c4a0 100644 --- a/uni_modules/uni-requestMerchantTransfer/utssdk/app-android/index.uts +++ b/uni_modules/uni-requestMerchantTransfer/utssdk/app-android/index.uts @@ -1,59 +1,23 @@ - import { RequestMerchantTransfer, RequestMerchantTransferOptions, RequestMerchantTransferGeneralCallbackResult } from '../interface.uts'; -import WXAPIFactory from 'com.tencent.mm.opensdk.openapi.WXAPIFactory' -import URLEncoder from 'java.net.URLEncoder' -import StandardCharsets from 'java.nio.charset.StandardCharsets' -import WXOpenBusinessView from 'com.tencent.mm.opensdk.modelbiz.WXOpenBusinessView' -import Build from 'com.tencent.mm.opensdk.constants.Build' -export const requestMerchantTransfer : RequestMerchantTransfer = function (options : RequestMerchantTransferOptions) { - var appId = options.appId - var api = WXAPIFactory.createWXAPI(UTSAndroid.getAppContext(), appId, false) - var wxSdkVersion = api.wxAppSupportAPI - if (wxSdkVersion >= Build.OPEN_BUSINESS_VIEW_SDK_INT) { - var req = WXOpenBusinessView.Req() - req.businessType = "requestMerchantTransfer" - // 通过 URL 编码处理参数，确保特殊字符不会影响请求 - var query = "" - query += 'mchId=' + encodeParams(options.mchId) + '&' - query += 'package=' + encodeParams(options.package) + '&' - if (appId != null) { - query += 'appId=' + encodeParams(options.appId) + '&' - } - if (options.openId != null) { - query += 'openId=' + encodeParams(options.openId) + '&' - } - if (options.subAppId != null) { - query += 'subAppId=' + encodeParams(options.subAppId) + '&' - } - if (options.subMchId != null) { - query += 'subMchId=' + encodeParams(options.subMchId) + '&' - } - query = query.substring(0, query.length - 1) - req.query = query - // 发送请求并检查返回值 - var ret = api.sendReq(req) - if (ret) { - var result : RequestMerchantTransferGeneralCallbackResult = { - errMsg: 'ok' +export const requestMerchantTransfer : RequestMerchantTransfer = function (options : RequestMerchantTransferOptions) { + RequestMerchantTransferNative.send( + options.appId, + options.mchId, + options.package, + options.openId, + options.subAppId, + options.subMchId, + (success : boolean, errMsg : string) => { + const result : RequestMerchantTransferGeneralCallbackResult = { + errMsg: errMsg } - options.success?.(result) - options.complete?.(result) - }else{ - var result : RequestMerchantTransferGeneralCallbackResult = { - errMsg: 'fail' + if (success) { + options.success?.(result) + } else { + options.fail?.(result) } - options.fail?.(result) options.complete?.(result) } - } else { - var result : RequestMerchantTransferGeneralCallbackResult = { - errMsg: '当前微信版本过低，请升级微信以使用该功能' - } - options.fail?.(result) - options.complete?.(result) - } -} -function encodeParams(params : string | null) : string | null { - return URLEncoder.encode(params, StandardCharsets.UTF_8.toString()) -} \ No newline at end of file + ) +} \ No newline at end of file diff --git a/utils/config.js b/utils/config.js index 31dd69b..52349ff 100644 --- a/utils/config.js +++ b/utils/config.js @@ -6,14 +6,19 @@ if (process.env.NODE_ENV === 'development') { } // #endif -export const BASE_URL = "https://api.tbmall.xin"; //生产 -export const MILD_BASE_URL = "https://agent.tbmall.xin/"; //中台生产 -export const kefuBaseUrl = "https://admin.tbmall.xin/api"; +// export const BASE_URL = "https://api.tbmall.xin"; //生产 +// export const MILD_BASE_URL = "https://agent.tbmall.xin/"; //中台生产 +// export const kefuBaseUrl = "https://admin.tbmall.xin/api"; +// export const SHARE_URL = 'https://h.tbmall.xin'; -// export const BASE_URL = baseUrl; // 本地测试 -// export const MILD_BASE_URL = "https://agent.o.tbmall.xin/"; //中台测试 -// export const kefuBaseUrl = "https://admin.o.tbmall.xin/api"; +export const BASE_URL = baseUrl; // 本地测试 +export const SHARE_URL = 'https://h.o.tbmall.xin'; +// 微信小程序版本：0-正式版；1-开发版；2-体验版。 +// 如果 SHARE_URL 为 https://h.tbmall.xin 则为正式版(0)，其余均为体验版(2) +export const MINI_PROGRAM_TYPE = (SHARE_URL && SHARE_URL.replace(/\/$/, '') === 'https://h.tbmall.xin') ? 0 : 2; +export const MILD_BASE_URL = "https://agent.o.tbmall.xin/"; //中台测试 +export const kefuBaseUrl = "https://admin.o.tbmall.xin/api"; // https://h.o.tbmall.xin/#/ @@ -22,8 +27,6 @@ export const kefuBaseUrl = "https://admin.tbmall.xin/api"; export const KEFU_BASE_URL = kefuBaseUrl; -export const SHARE_URL = 'https://h.tbmall.xin'; - export const PRIVACY_EN = "https://www.finecc.net/?Privacy-Agreement/";//隐私协议地址（英文版） export const PRIVACY_CN = "https://www.finecc.net/?Privac |y/";//隐私协议地址（中文版）x diff --git a/utils/douyin-pay.js b/utils/douyin-pay.js index 73ad083..2b4d6c3 100644 --- a/utils/douyin-pay.js +++ b/utils/douyin-pay.js @@ -42,10 +42,12 @@ export function filterDouyinPayWays(ways) { return (ways || []).filter(item => item.type !== 'douyin'); // #endif } +let pendingSuccessUrl = ''; + async function showState(state, key, orderNum) { if (key !== accountKey()) return; if (state.state === 'paid') { - const navigated = await jumpToPaymentSuccess(); + const navigated = await jumpToPaymentSuccess(pendingSuccessUrl); if (key !== accountKey()) return; if (!navigated) { // Retain the record so the next onShow/click can retry navigation without paying again. @@ -53,6 +55,7 @@ async function showState(state, key, orderNum) { return; } failureShown.delete(key); + pendingSuccessUrl = ''; } else { // Same failure page as WeChat/Alipay. Ending the UI attempt is not a channel close. // Keep unresolved orders for reconciliation, but do not push the page on every onShow. @@ -178,6 +181,7 @@ export async function appDypayFun(payment) { // #ifdef APP-PLUS if (active || resuming) return; active = true; + pendingSuccessUrl = payment?.customSuccessUrl || ''; const key = accountKey(); try { if (!key || !payment.orderNum) throw new Error('登录身份或支付订单编号缺失'); diff --git a/utils/enumUtils.js b/utils/enumUtils.js index 95735e1..74b6176 100644 --- a/utils/enumUtils.js +++ b/utils/enumUtils.js @@ -454,7 +454,7 @@ export const FINANCE_WITHDRAWAL_STATUS = [ ]; /** - * 页面：1-APP首页，2-APP分类页，3-资讯，4-爆单区，5-好物区,6-积分专区,7-数字积分页 8-新人专享、9-超级补贴、10-限时秒杀、11-领券中心 + * 页面：1-APP首页，2-APP分类页，3-资讯，4-爆单区，5-好物区,6-积分专区,7-数字积分页 8-新人专享、9-超级补贴、10-限时秒杀、11-领券中心 12-拼团活动 * @type {[{value: string, key: string}]} */ export const APP_PAGE_TYPE = { @@ -469,6 +469,7 @@ export const APP_PAGE_TYPE = { SUPER_SUBSIDY: 9, SECKILL: 10, COUPON: 11, + GROUP_BUY: 12, }; /** @@ -520,6 +521,10 @@ export const ACTIVITY_TYPE = [ key: 'seckill', value: "秒杀活动" }, + { + key: 'group', + value: "拼团活动" + }, ] // 商品--分类的类型 type @@ -549,6 +554,11 @@ export const SORT_TYPE = [ value: "限时秒杀", path: "/pages/active/limited-time/limited-time" }, + { + key: 22, + value: "超值拼团", + path: "/pages/active/group-buying/group-buying" + }, ] // 物流更改状态 0=未申请，1=待审核，2=审核通过，3=审核驳回 diff --git a/utils/payUtils.js b/utils/payUtils.js index f46a3ab..2effc30 100644 --- a/utils/payUtils.js +++ b/utils/payUtils.js @@ -1,5 +1,5 @@ -import { appDypayFun } from './douyin-pay.js'; -import { jumpToPaymentSuccess, jumpToPaymentFailure } from './payment-navigation.js'; +import { appDypayFun } from './douyin-pay.js'; +import { jumpToPaymentSuccess, jumpToPaymentFailure } from './payment-navigation.js'; import { feedback } from "@/api/payment.js"; /** @@ -8,7 +8,7 @@ import { feedback } from "@/api/payment.js"; * @param {Object} orderId 支付的订单ID * @param {Object} orderNum 支付的订单编号 */ -export function appWxpayFun(alipay, orderId, orderNum) { +export function appWxpayFun(alipay, orderId, orderNum, customSuccessUrl) { const type = alipay.type; const orderStr = alipay.orderStr; console.log("微信支付---", alipay, type); @@ -29,7 +29,7 @@ export function appWxpayFun(alipay, orderId, orderNum) { success: function (res) { console.log("success:" + res); payFeedbackFun(orderId, orderNum, 1); - jumpWayOk(); + jumpWayOk(customSuccessUrl); }, fail: function (err) { console.log("fail:", err); @@ -53,7 +53,7 @@ export function appWxpayFun(alipay, orderId, orderNum) { success: function (res) { console.log("success:" + res); payFeedbackFun(orderId, orderNum, 1); - jumpWayOk(); + jumpWayOk(customSuccessUrl); }, fail: function (err) { console.log("fail:", err); @@ -76,8 +76,9 @@ export function appWxpayFun(alipay, orderId, orderNum) { * @param {Object} alipay 微信支付的参数 * @param {Object} orderId 支付的订单ID * @param {Object} orderNum 支付的订单编号 + * @param {string} customSuccessUrl 自定义成功跳转页面 */ -export function zfbPayFun(alipay, orderId, orderNum) { +export function zfbPayFun(alipay, orderId, orderNum, customSuccessUrl) { console.log("alipay", alipay); const type = alipay.type; const orderStr = alipay.orderStr; @@ -97,7 +98,7 @@ export function zfbPayFun(alipay, orderId, orderNum) { success: function (res) { console.log("zfbPayFun res", res); payFeedbackFun(orderId, orderNum, 1); - jumpWayOk(); + jumpWayOk(customSuccessUrl); }, fail: function (err) { console.error("支付宝支付error", err); @@ -124,13 +125,26 @@ export const appDyPayFun = douyinPayFun; export const appDouyinPayFun = douyinPayFun; // 跳转到支付成功页面 -export function jumpWayOk() { - return jumpToPaymentSuccess(); -} +export function jumpWayOk(customUrl) { + if (customUrl) { + const pages = typeof getCurrentPages === "function" ? getCurrentPages() : []; + if (pages[pages.length - 1]?.route === customUrl.replace(/^\//, "")) return Promise.resolve(true); + return new Promise((resolve) => { + uni.redirectTo({ + url: customUrl, + success: () => resolve(true), + fail: () => { + uni.navigateTo({ url: customUrl, success: () => resolve(true), fail: () => resolve(false) }); + }, + }); + }); + } + return jumpToPaymentSuccess(); +} // 跳转到支付失败页面 -export function jumpWayError() { - return jumpToPaymentFailure(); -} +export function jumpWayError() { + return jumpToPaymentFailure(); +} /** * 支付结果回调 * @param {Object} orderId 支付订单ID diff --git a/utils/payment-navigation.js b/utils/payment-navigation.js index 1689c27..3dab273 100644 --- a/utils/payment-navigation.js +++ b/utils/payment-navigation.js @@ -1,6 +1,6 @@ // Shared result pages for WeChat, Alipay and Douyin. Keep the existing page design. -export function jumpToPaymentSuccess() { - return jumpToPaymentResult('/pages/order_package/order_submit_ok/order_submit_ok'); +export function jumpToPaymentSuccess(customUrl) { + return jumpToPaymentResult(customUrl || '/pages/order_package/order_submit_ok/order_submit_ok'); } export function jumpToPaymentFailure() { diff --git a/utils/request.js b/utils/request.js index f0335b4..1807c9d 100644 --- a/utils/request.js +++ b/utils/request.js @@ -25,6 +25,50 @@ function hideLoading() { } } +function getCurrentPageFullPath() { + try { + // #ifdef H5 + if (typeof window !== "undefined" && window.location) { + const hash = window.location.hash || ""; + if (hash) { + const cleanHash = hash.replace(/^#\/?/, "/"); + if (cleanHash && !cleanHash.includes("login_package/login/login")) { + return cleanHash; + } + } + } + // #endif + + const pages = getCurrentPages(); + if (pages && pages.length) { + const cur = pages[pages.length - 1]; + if (cur) { + // #ifdef H5 + if (cur.$route && cur.$route.fullPath && !cur.$route.fullPath.includes("login_package/login/login")) { + return cur.$route.fullPath; + } + // #endif + + if (cur.route && !cur.route.includes("login_package/login/login")) { + let path = cur.route.startsWith("/") ? cur.route : "/" + cur.route; + const opts = cur.pageOptions || cur.options || cur.$page?.options || {}; + const keys = Object.keys(opts); + if (keys.length > 0) { + const qs = keys + .map((k) => `${k}=${encodeURIComponent(opts[k])}`) + .join("&"); + path += (path.includes("?") ? "&" : "?") + qs; + } + return path; + } + } + } + } catch (e) { + console.error("获取当前页面完整路径失败:", e); + } + return ""; +} + function request(options) { const { url, @@ -76,77 +120,83 @@ function request(options) { reject(new Error('服务请求失败，请稍后重试')); return; } - if (data.status === 500) { - uni.showToast({ - title: "系统异常，请稍后再试", - icon: "none", // 可选 success/loading/none - duration: 2000, // 持续时长，单位ms - mask: false, // 是否显示透明蒙层，防止触摸穿透 - }); + if (data.status === 500) { + uni.showToast({ + title: "系统异常，请稍后再试", + icon: "none", // 可选 success/loading/none + duration: 2000, // 持续时长，单位ms + mask: false, // 是否显示透明蒙层，防止触摸穿透 + }); reject(new Error('系统异常，请稍后再试')); return; - } - // 601 微信登录没注册 - if (data.bizcode === 100) { - resolve(data); // 成功时返回数据 - } else if (data.bizcode === 201) { - if ([201, 200].includes(data.errcode)) { - uni.showToast({ - title: "登录失效，请重新登录", - icon: "none", // 可选 success/loading/none - duration: 2000, // 持续时长，单位ms - mask: false, // 是否显示透明蒙层，防止触摸穿透 - position: "middle", // 位置，可选 top/middle/bottom - }); - } else { - uni.showToast({ - title: data.msg, - icon: "none", // 可选 success/loading/none - duration: 2000, // 持续时长，单位ms - mask: false, // 是否显示透明蒙层，防止触摸穿透 - position: "middle", // 位置，可选 top/middle/bottom - }); - } - /** - * 205:已经有账号，返回登录页面 - * 200 or 201：token失效，返回登录页面 - */ - if ([201, 200, 205].includes(data.errcode)) { - uni.removeStorageSync(TOKEN_NAME); - uni.removeStorageSync(USER_DATA); - let timer = setTimeout(() => { - clearTimeout(timer); - timer = null; - uni.navigateTo({ - url: "/pages/login_package/login/login", - }); - }, 2000); - } + } + // 601 微信登录没注册 + if (data.bizcode === 100) { + resolve(data); // 成功时返回数据 + } else if (data.bizcode === 201) { + if ([201, 200].includes(data.errcode)) { + uni.showToast({ + title: "登录失效，请重新登录", + icon: "none", // 可选 success/loading/none + duration: 2000, // 持续时长，单位ms + mask: false, // 是否显示透明蒙层，防止触摸穿透 + position: "middle", // 位置，可选 top/middle/bottom + }); + } else { + uni.showToast({ + title: data.msg, + icon: "none", // 可选 success/loading/none + duration: 2000, // 持续时长，单位ms + mask: false, // 是否显示透明蒙层，防止触摸穿透 + position: "middle", // 位置，可选 top/middle/bottom + }); + } + + /** + * 205:已经有账号，返回登录页面 + * 200 or 201：token失效，返回登录页面 + */ + if ([201, 200, 205].includes(data.errcode)) { + uni.removeStorageSync(TOKEN_NAME); + uni.removeStorageSync(USER_DATA); + let timer = setTimeout(() => { + clearTimeout(timer); + timer = null; + const fullPath = getCurrentPageFullPath(); + if (fullPath) { + uni.setStorageSync("login_redirect_url", fullPath); + } + const redirectParam = fullPath ? "?redirect=" + encodeURIComponent(fullPath) : ""; + uni.navigateTo({ + url: `/pages/login_package/login/login${redirectParam}`, + }); + }, 2000); + } reject(data); } else { - console.log("错误-1", data, url); - uni.showToast({ - title: data.msg || "系统错误，请稍后再试", - icon: "none", // 可选 success/loading/none - duration: 2000, // 持续时长，单位ms - }); - reject(data); // 其他错误情况返回错误信息 - } - }, - fail: (error) => { - console.log("错误-2", url); - if (isShowLoading) { - hideLoading(); - } - uni.showToast({ - title: "服务器异常，稍后再试", - icon: "none", // 可选 success/loading/none - duration: 2000, // 持续时长，单位ms - }); + console.log("错误-1", data, url); + uni.showToast({ + title: data.msg || "系统错误，请稍后再试", + icon: "none", // 可选 success/loading/none + duration: 2000, // 持续时长，单位ms + }); + reject(data); // 其他错误情况返回错误信息 + } + }, + fail: (error) => { + console.log("错误-2", url); + if (isShowLoading) { + hideLoading(); + } + uni.showToast({ + title: "服务器异常，稍后再试", + icon: "none", // 可选 success/loading/none + duration: 2000, // 持续时长，单位ms + }); reject(error); - }, - }); - }); -} - + }, + }); + }); +} + export default request;