diff --git a/app.js b/app.js index 8ea8cc9..9c5b074 100644 --- a/app.js +++ b/app.js @@ -2,14 +2,14 @@ let config = require("./config/config.js"); const { defaultObj, huanLeChengObj } = require("./utils/mouldStyle.js") const Http = require("./utils/HttpBasics"); const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {} +//无商圈注释 +var myPluginInterface = requirePlugin('auto-points-plugin') -var myPluginInterface = extConfig.attr.businessSwitch ? requirePlugin('auto-points-plugin') : null; let businessSwitch = extConfig.attr.businessSwitch ? extConfig.attr.businessSwitch : false - App({ data: { newArr: [], //存放分享二维进入消息信息 - businessSwitch: businessSwitch, //判断是否开启商圈自助积分 + businessSwitch: businessSwitch || null, //判断是否开启商圈自助积分 }, onLaunch: function (options) { diff --git a/components/shop/shop.wxml b/components/shop/shop.wxml index 37e1127..c1d5431 100644 --- a/components/shop/shop.wxml +++ b/components/shop/shop.wxml @@ -25,11 +25,9 @@ - - - + @@ -43,8 +44,7 @@ 只有支付完成的时 才显示兑换码 --> - + 兑换码: {{showIdFalg?order.couponOrderId:order.couponOrderIdS}} @@ -73,9 +73,9 @@ 快递单号: - + {{order.deliveryInfo.expressageIdInput}} - + 复制 查询物流 @@ -95,14 +95,15 @@ - + + 礼券: - + - + {{item.title}} 面额:{{item.priceStr}}元 @@ -120,11 +121,12 @@ + 转赠给微信好友 + 签收 - + 是否确认收到商品? 签收后将完成订单 diff --git a/pages/spellGroup/mySpellGroup/index.js b/pages/spellGroup/mySpellGroup/index.js index ee0dcff..04f9e1d 100644 --- a/pages/spellGroup/mySpellGroup/index.js +++ b/pages/spellGroup/mySpellGroup/index.js @@ -408,8 +408,9 @@ Page({ //参与别人的拼团 gotoPartner() { + console.log(this.data.spellData.nickName, 'nickname'); wx.navigateTo({ - url: `/pages/joinFrDpell/index?orderId=${this.data.spellData.orderId}&couponId=${this.data.spellData.couponId}&orderGroupId=${this.data.spellData.orderGroupId}&couponChannelId=${this.data.couponChannelId}&avatarUrl=${this.data.spellData.avatarUrl}&nickName=${this.data.spellData.nickName}` + url: `/pages/joinFrDpell/index?orderId=${this.data.spellData.orderId}&couponId=${this.data.spellData.couponId}&orderGroupId=${this.data.spellData.orderGroupId}&nickName=${this.data.spellData.nickName}&couponChannelId=${this.data.couponChannelId}&avatarUrl=${this.data.spellData.avatarUrl}` }); }, /** @@ -474,10 +475,10 @@ Page({ data.salePrice = (data.salePrice / 100).toFixed(2); data.validStartDate = utils.formatTime(data.validStartDate, 'yyyy-MM-dd') data.validEndDate = utils.formatTime(data.validEndDate, 'yyyy-MM-dd') - // that.setData({ - // data, - // merchantVoList: data.merchantVoList - // }); + that.setData({ + data, + // merchantVoList: data.merchantVoList + }); Http.get({ url: config.api.couponMerchant, data: { diff --git a/pages/theme/index1/index.js b/pages/theme/index1/index.js index 8557992..f616e3a 100644 --- a/pages/theme/index1/index.js +++ b/pages/theme/index1/index.js @@ -1,9 +1,12 @@ const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {} console.log(extConfig, 'extConfig'); let ifStoreApp = extConfig.attr.ifStoreApp; -let businessSwitch = 1 * extConfig.attr.businessSwitch ? extConfig.attr.businessSwitch : false -console.log(businessSwitch, 'businessSwitch'); + +// 无商圈注释 +const myPluginInterface = requirePlugin('auto-points-plugin') let businessVersion = 1 * extConfig.attr.businessVersion + +let businessSwitch = 1 * extConfig.attr.businessSwitch ? extConfig.attr.businessSwitch : false let mch_id = extConfig.attr.mchId const navigationBarHeight = (getApp().statusBarHeight + 44) + "px" const Http = require("../../../utils/HttpBasics"); @@ -12,7 +15,6 @@ const config = require("../../../config/config"); const QR = require("../../../utils/memberqrcode.js"); const util = require("../../../utils/util"); const bgColor = require("../../../utils/bgColor.js") -const myPluginInterface = requirePlugin('auto-points-plugin') || '' let app = getApp(); Page({ data: { diff --git a/project.config.json b/project.config.json index 0a33f27..79c196c 100644 --- a/project.config.json +++ b/project.config.json @@ -34,7 +34,7 @@ }, "compileType": "miniprogram", "libVersion": "2.11.2", - "appid": "wxfa336cad86ed598d", + "appid": "wx453ae0d37f3550d0", "projectname": "C", "simulatorType": "wechat", "simulatorPluginLibVersion": {}, diff --git a/project.private.config.json b/project.private.config.json index 9dec4b6..5bcf610 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -3,7 +3,9 @@ "projectname": "C", "setting": { "compileHotReLoad": true, - "urlCheck": true + "urlCheck": true, + "preloadBackgroundData": false, + "useIsolateContext": true }, - "libVersion": "2.27.1" + "libVersion": "2.28.1" } \ No newline at end of file