diff --git a/App.vue b/App.vue index bd28e4c..2530095 100644 --- a/App.vue +++ b/App.vue @@ -1,4 +1,5 @@ + - - diff --git a/components/verification/verification.vue b/components/verification/verification.vue index a81d307..52002e6 100644 --- a/components/verification/verification.vue +++ b/components/verification/verification.vue @@ -49,31 +49,7 @@ - + @@ -209,13 +185,12 @@ export default { }, success: (res) => { this.endLoad = true; - res.data.result == false ? (res.data.result = false) : (res.data.result = true); if (res.data && res.data.result) { - // // 验证成功后把key发送出去,后端会把验证信息存在缓存里 + //验证成功后把key发送出去,后端会把验证信息存在缓存里 this.$emit("send", this.key); this.hide(); this.vsr = true; @@ -389,33 +364,6 @@ export default { margin-top: -35rpx; } -.lk-tag { - height: 50rpx; - padding: 0 10rpx; - display: flex; - justify-content: center; - align-items: center; - border: 2rpx solid #24bd9f; - border-radius: 6rpx; - color: #1c947a; - font-weight: 500; -} - -.tb-tag-my { - border-radius: 15rpx; - font-size: 16rpx; - margin-left: 5rpx; -} - -.my-green { - color: #29c7a5; -} - -.my-hui { - color: #585858; - font-size: 22rpx; -} - .flex-column-center { display: flex; flex-direction: column; @@ -524,75 +472,15 @@ export default { bottom: 70rpx; } -.white-box { - padding: 0 20rpx; - margin-bottom: 15rpx; - margin-top: 5rpx; - width: 715rpx; - background-color: #ffffff; - border-radius: 30rpx; -} -.green-box { - padding: 0 20rpx; - margin-bottom: 15rpx; - margin-top: 5rpx; - width: 715rpx; - background-color: #ffffff; - border-radius: 30rpx; - background-image: linear-gradient(#1faf97, #29c7a5); -} -.yuan-sm { - width: 13rpx; - height: 13rpx; - border-radius: 50%; - background-color: #1fc189; - margin-left: 10rpx; -} -.yuan-normal { - width: 14rpx; - height: 14rpx; - border-radius: 50%; - background-color: #159f3c; - margin-left: 10rpx; -} - -.yuan-normal-red { - width: 14rpx; - height: 14rpx; - border-radius: 50%; - background-color: #bc3c11; - margin-left: 10rpx; -} - -.yuan-sm-red { - width: 13rpx; - height: 13rpx; - border-radius: 50%; - background-color: #de410d; - margin-left: 10rpx; -} - -.white-box-all { - margin-top: 5rpx; - width: 750rpx; - background-color: #ffffff; - border-radius: 13px; -} .moneycolor { color: #ea5002; } -.text-bold-sm { - font-weight: 425; -} -.sm-moneycolor { - color: #e3793b; -} .margin-top { margin-top: 20rpx; @@ -610,71 +498,13 @@ export default { margin-left: 20rpx; } -.margin-left-top { - margin-left: 20rpx; - margin-top: 20rpx; -} + .margin-right { margin-right: 20rpx; } -.my-absolute { - position: absolute; -} -.my-fixed { - position: fixed; -} - -.my-seach { - width: 450rpx; - height: 55rpx; - background-color: #f8f8f8; - border-radius: 30rpx; - padding-left: 20rpx; -} - -.move-view { - width: 48rpx; - height: 10rpx; - background-color: #28ba91; - border-radius: 4rpx; - margin-left: 100rpx; -} - -.move-view-p { - width: 45rpx; - height: 10rpx; - background-color: #28ba91; - border-radius: 4rpx; -} - -.header-dh { - position: fixed; - padding-top: 20rpx; - padding-bottom: 15rpx; - height: 70rpx; - width: 750rpx; - background-color: #f1f1f1; - z-index: 20; -} - -.tp-normal { - width: 60rpx; - height: 60rpx; -} - -.tp-sm { - width: 45rpx; - height: 45rpx; -} - -.tp-big { - width: 70rpx; - height: 70rpx; - border-radius: 50%; -} .main-color { color: #07d188; diff --git a/config/api.js b/config/api.js index 5932087..915f2a7 100644 --- a/config/api.js +++ b/config/api.js @@ -4,8 +4,10 @@ */ // 开发环境 const dev = { - common: "https://common-api.pickmall.cn", - buyer: "https://buyer-api.pickmall.cn", + common: 'http://192.168.0.109:8890', + buyer: 'http://192.168.0.109:8888', + seller: 'http://192.168.0.109:8889', + manager: 'http://192.168.0.109:8887' }; // 生产环境 const prod = { diff --git a/main.js b/main.js index ff8cc7e..379e1a1 100644 --- a/main.js +++ b/main.js @@ -2,7 +2,6 @@ import Vue from "vue"; import App from "./App"; import * as filters from "./utils/filters.js"; // global filter import uView from "uview-ui"; -import empty from "./components/empty"; import store from "./store"; // #ifdef H5 @@ -12,6 +11,8 @@ let btn = Vue.component("airBtn", airBtn); //全局注册 document.body.appendChild(new btn().$mount().$el); // #endif + + Object.keys(filters).forEach((key) => { Vue.filter(key, filters[key]); }); @@ -27,17 +28,15 @@ const msg = (title, duration = 1500, mask = false, icon = "none") => { mask, icon, }); -}; +}; // 引入vuex -Vue.prototype.$store = store; -// 全局引入空组件 -Vue.component("empty", empty); +Vue.prototype.$store = store; Vue.use(uView); -Vue.config.productionTip = false; +Vue.config.productionTip = false; // 主题色 -Vue.prototype.$mainColor = "#ff3c2a"; +Vue.prototype.$mainColor = "#ff3c2a"; // 高亮主题色 -Vue.prototype.$lightColor = "#ff6b35"; +Vue.prototype.$lightColor = "#ff6b35"; // 可直接 this.$api调用 Vue.prototype.$api = { msg }; diff --git a/manifest.json b/manifest.json index e060251..5e89413 100644 --- a/manifest.json +++ b/manifest.json @@ -197,7 +197,13 @@ "myPlugin" : { "version" : "1.1.0", "provider" : "wx738958e0f4c894f9" - } + }, + "live-player-plugin": { + + "version": "1.3.0", + + "provider": "wx2b03c6e691cd7370" + } } }, "h5" : { diff --git a/pages.json b/pages.json index aef820f..b86d1b5 100644 --- a/pages.json +++ b/pages.json @@ -42,15 +42,7 @@ "navigationBarTitleText": "积分商城", "enablePullDownRefresh": true } - }, - { - "path": "pages/navigation/selectShops", - "style": { - "navigationBarTitleText": "精选店铺" - } - }, - - + }, { "path": "pages/navigation/search/searchPage", "style": { @@ -364,17 +356,17 @@ //app页面不显示滚动条 "scrollIndicator": "none" } - }, - { // 客服 - "path": "customerservice/index", - "style": { - "navigationBarTitleText": "客服", - "usingComponents": { - // #ifdef MP-WEIXIN - "chat": "plugin://myPlugin/chat" - // #endif - } - } + }, + { // 客服 + "path": "customerservice/index", + "style": { + "navigationBarTitleText": "客服", + "usingComponents": { + // #ifdef MP-WEIXIN + "chat": "plugin://myPlugin/chat" + // #endif + } + } } ] @@ -435,7 +427,9 @@ "style": { "navigationBarTitleText": "限时抢购", "app-plus": { - "titleNView": {} + "titleNView": { + "homeButton":true + } } } }, @@ -462,7 +456,7 @@ "path": "lives", "style": { "navigationStyle": "custom", - "navigationBarTextStyle": "white" + "navigationBarTextStyle": "black" } } @@ -584,6 +578,7 @@ "enablePullDownRefresh": true, "app-plus": { "bounce": "none" + } } }, @@ -712,12 +707,12 @@ "text": "分类" }, - // { - // "pagePath": "pages/navigation/point/point-mall", - // "iconPath": "static/tabbar/point-mall.png", - // "selectedIconPath": "static/tabbar/point-mall-s.png", - // "text": "积分商城" - // }, + { + "pagePath": "pages/navigation/point/point-mall", + "iconPath": "static/tabbar/point-mall.png", + "selectedIconPath": "static/tabbar/point-mall-s.png", + "text": "积分商城" + }, { "pagePath": "pages/tabbar/cart/cartList", "iconPath": "static/tabbar/cart.png", diff --git a/pages/mine/myTracks.vue b/pages/mine/myTracks.vue index 11e7374..842e187 100644 --- a/pages/mine/myTracks.vue +++ b/pages/mine/myTracks.vue @@ -1,30 +1,33 @@