diff --git a/App.vue b/App.vue index ebbdb36..3b37698 100644 --- a/App.vue +++ b/App.vue @@ -7,10 +7,10 @@ import {setTabBarBadge } from'./utils/util.js' uni.$ajax = request; //挂载全局请求方法 export default { onShow() { - + }, onLaunch: function () { - + //#ifdef H5 // var head = document.head || document.getElementsByTagName('head')[0]; // let meta = document.createElement('meta') @@ -20,7 +20,7 @@ export default { // console.log(meta) // head.appendChild(meta) - + // #endif // #ifdef MP-WEIXIN uni.getSetting({ @@ -33,7 +33,7 @@ export default { this.globalData.userInfo = res.userInfo; // 由于 getUserInfo 是网络请求,可能会在 Page.onLoad 之后才返回 // 所以此处加入 callback 以防止这种情况 if (this.userInfoReadyCallback) { - this.userInfoReadyCallback(res); + this.userInfoReadyCallback(res); } } }); @@ -129,7 +129,7 @@ $black: #333333; .operation .btns .addcart { border-color: $color; color: $color; - + } .operation .btns .dingjin { background-color: $color; @@ -154,7 +154,11 @@ $black: #333333; color: #fff; background-color: $color; } - + &.item1 { + color: $color; + border: 1upx solid $color; + background: transparent; + } } .iconfont, .weizhi_icon .icon-dizhi, @@ -183,11 +187,11 @@ $black: #333333; .nocart .iconfont { color: $color; } - + .bottom_all .rights .jiesuan { background: $color; } - + } &.jieguo { background-color: $color; @@ -213,7 +217,7 @@ $black: #333333; .active { background-color: $color; } - + } .list_box .bottom .btns .pay{ color: $color; @@ -223,15 +227,20 @@ $black: #333333; background-color: $color; } } - + } &.evaluate { .goods_price .price-text { color: $color; } } - - + &.mycollection { + .iconfont { + color: $color; + } + } + + } .theme { &.default { @@ -239,55 +248,55 @@ $black: #333333; } &.red { @include scss6($red) - + } &.orange { @include scss6($orange) - + } &.yellow { @include scss6($yellow) - + } &.olive { @include scss6($olive) - + } &.green { @include scss6($green) - + } &.cyan { @include scss6($cyan) - + } &.blue { @include scss6($blue) - + } &.purple { @include scss6($purple) - + } &.mauve { @include scss6($mauve) - + } &.pink { @include scss6($pink) - + } &.brown { @include scss6($brown) - + } &.grey { @include scss6($grey) - + } &.black { @include scss6($black) - + } } - \ No newline at end of file + diff --git a/config/index.js b/config/index.js index ddea8ba..9e31efc 100644 --- a/config/index.js +++ b/config/index.js @@ -1,3 +1,6 @@ +const isPro = true export default { - imgUrl: 'http://47.100.35.222:8080/jeecg-boot/sys/common/static/' -} \ No newline at end of file + imgUrl: 'http://47.100.35.222:8080/jeecg-boot/sys/common/static/', + apiUrl: isPro ? 'http://47.100.35.222:8080/jeecg-boot' : 'http://47.100.35.222:8080/jeecg-boot', + isPro +} diff --git a/pages/views/order/orderDetails.vue b/pages/views/order/orderDetails.vue index 358da86..c0ec73c 100644 --- a/pages/views/order/orderDetails.vue +++ b/pages/views/order/orderDetails.vue @@ -137,8 +137,7 @@ 合计: ¥{{goods.totalAmount}} - 取消订单 diff --git a/pages/views/user/allFootprint.vue b/pages/views/user/allFootprint.vue index 7a71be8..11324a9 100644 --- a/pages/views/user/allFootprint.vue +++ b/pages/views/user/allFootprint.vue @@ -1,7 +1,7 @@