diff --git a/components/vc-discount/vc-discount.vue b/components/vc-discount/vc-discount.vue index 414c7e8..8a6e0a1 100644 --- a/components/vc-discount/vc-discount.vue +++ b/components/vc-discount/vc-discount.vue @@ -91,6 +91,9 @@ _totalDiscountMoney += parseFloat(Math.abs(disItem.discountPrice)); disItem.discountPrice = Math.abs(disItem.discountPrice); } + if(disItem.ruleId == '102020008'){ + _totalDiscountMoney = 0; + } _selectDiscount.push(disItem); }) // if(_totalDiscountMoney > 0){ diff --git a/conf/config.js b/conf/config.js index 8f733d2..d3a8ecc 100644 --- a/conf/config.js +++ b/conf/config.js @@ -15,16 +15,16 @@ const baseUrl = '/'; // #ifndef H5 //服务器域名 小程序 或者 app 时 后端地址 -const baseUrl = 'https://xytzjt.vip/'; +const baseUrl = 'https://crsdt.cn/'; // #endif -let commonBaseUrl = 'https://xytzjt.vip/'; +let commonBaseUrl = 'https://crsdt.cn/'; //商城的url -let mallUrl = 'https://mallapp.xytzjt.vip/'; +let mallUrl = 'https://mallapp.crsdt.cn/'; //商城小程序ID -let mallMinAppId = "wxa6504363be652e26"; +let mallMinAppId = "wx8ded6b260f1b8f63"; //默认的小区ID和名称,用户还没有登录时显示的小区信息 diff --git a/manifest.json b/manifest.json index c2aeaca..df00583 100644 --- a/manifest.json +++ b/manifest.json @@ -59,7 +59,7 @@ "quickapp" : {}, "mp-weixin" : { "usingComponents" : true, - "appid" : "wxfaeb2d6c35347734", + "appid" : "wx44c2329a271b1e29", "setting" : { "urlCheck" : false, "es6" : false