diff --git a/config/index.js b/config/index.js index 4fcc479..633b56c 100644 --- a/config/index.js +++ b/config/index.js @@ -1,4 +1,4 @@ -export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; -// export const VUE_APP_API_URL = 'https://h5api.dayouqiantu.cn/api'; +// export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; +export const VUE_APP_API_URL = 'https://h5api.dayouqiantu.cn/api'; export const VUE_APP_RESOURCES_URL = 'https://h5.dayouqiantu.cn/static'; diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue index 2895e56..956e9a3 100644 --- a/pages/order/MyOrder/index.vue +++ b/pages/order/MyOrder/index.vue @@ -38,13 +38,14 @@ - 拼团 - 秒杀 - 砍价 - + >拼团 + 秒杀 + 砍价 + 门店 + {{ dataFormat(order.addTime) }} {{ getStatus(order) }} @@ -200,7 +201,7 @@ export default { }, computed: mapGetters(["userInfo"]), onShow: function() { - console.log(this) + console.log(this); this.type = parseInt(this.$yroute.query.type) || 0; this.changeType(this.type); this.getOrderData(); diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue index 15eefa8..b761526 100644 --- a/pages/order/OrderDetails/index.vue +++ b/pages/order/OrderDetails/index.vue @@ -45,7 +45,7 @@ 'bg-color-red': status.type > 1 && status.type != 6 && status.type != 9 }" - v-if="orderInfo.shipping_type === 1" + v-if="orderInfo.shippingType === 1" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+
核销信息
+
+
+ +
+
+
+ +
+
{{ orderInfo.verifyCode }}
+
+
+
+ 核销时间 +
+
+ 每日： + {{ system_store.dayTime }} +
+
+
+
+ 使用说明 +
+
可将二维码出示给店员扫描或提供数字核销码
+
+
+
+
+
自提地址信息
+
+ 查看位置 +
+
- {{ orderInfo.realName - }} + {{ orderInfo.realName }} {{ orderInfo.userPhone }} {{ orderInfo.userAddress }} - - - - - - - - - - - +
+
+ {{ system_store.name}} + {{ system_store.phone }} + +
+
{{ system_store.address }}
+
@@ -160,8 +154,7 @@ 订单编号： - {{ orderInfo.orderId - }} + {{ orderInfo.orderId }} 复制 @@ -272,9 +265,7 @@ @@ -319,13 +310,11 @@ top: 0; z-index: 10000; } - .order-details .writeOff { background-color: #fff; margin-top: 0.13 * 100rpx; padding-bottom: 0.3 * 100rpx; } - .order-details .writeOff .title { font-size: 0.3 * 100rpx; color: #282828; @@ -334,7 +323,6 @@ padding: 0 0.3 * 100rpx; line-height: 0.87 * 100rpx; } - .order-details .writeOff .grayBg { background-color: #f2f5f7; width: 5.9 * 100rpx; @@ -343,31 +331,26 @@ margin: 0.5 * 100rpx auto 0 auto; padding-top: 0.55 * 100rpx; } - .order-details .writeOff .grayBg .pictrue { width: 2.9 * 100rpx; height: 2.9 * 100rpx; margin: 0 auto; } - -.order-details .writeOff .grayBg .pictrue image { +.order-details .writeOff .grayBg .pictrue img { width: 100%; height: 100%; display: block; } - .order-details .writeOff .gear { width: 5.9 * 100rpx; height: 0.3 * 100rpx; margin: 0 auto; } - -.order-details .writeOff .gear image { +.order-details .writeOff .gear img { width: 100%; height: 100%; display: block; } - .order-details .writeOff .num { background-color: #f0c34c; width: 5.9 * 100rpx; @@ -379,50 +362,42 @@ text-align: center; padding-top: 0.04 * 100rpx; } - .order-details .writeOff .rules { margin: 0.46 * 100rpx 0.3 * 100rpx 0 0.3 * 100rpx; border-top: 0.01 * 100rpx solid #f0f0f0; padding-top: 0.1 * 100rpx; } - .order-details .writeOff .rules .item { margin-top: 0.15 * 100rpx; } - .order-details .writeOff .rules .item .rulesTitle { font-size: 0.28 * 100rpx; color: #282828; } - .order-details .writeOff .rules .item .rulesTitle .iconfont { font-size: 0.3 * 100rpx; color: #333; margin-right: 0.08 * 100rpx; margin-top: 0.05 * 100rpx; } - .order-details .writeOff .rules .item .info { font-size: 0.28 * 100rpx; color: #999; margin-top: 0.05 * 100rpx; } - .order-details .writeOff .rules .item .info .time { margin-left: 0.2 * 100rpx; } - .order-details .map { height: 0.86 * 100rpx; font-size: 0.3 * 100rpx; color: #282828; line-height: 0.86 * 100rpx; - border-bottom: 1rpx solid #f0f0f0; + border-bottom: 0.01 * 100rpx solid #f0f0f0; margin-top: 0.13 * 100rpx; background-color: #fff; padding: 0 0.3 * 100rpx; } - .order-details .map .place { font-size: 0.26 * 100rpx; width: 1.76 * 100rpx; @@ -431,14 +406,12 @@ line-height: 0.5 * 100rpx; text-align: center; } - .order-details .map .place .iconfont { font-size: 0.27 * 100rpx; height: 0.27 * 100rpx; line-height: 0.27 * 100rpx; margin: 0.02 * 100rpx 0.03 * 100rpx 0 0; } - .order-details .address .name .iconfont { font-size: 0.34 * 100rpx; margin-left: 0.1 * 100rpx; @@ -528,7 +501,7 @@ export default { latitude: this.system_store.latitude, longitude: this.system_store.longitude, name: this.system_store.name, - address: this.system_store._detailed_address + address: this.system_store.address }; } else { if (!this.mapKey) @@ -546,7 +519,7 @@ export default { this.$yrouter.back(); return; } else { - console.log(this) + console.log(this); this.$yrouter.replace({ path: "/pages/order/MyOrder/index" }); @@ -556,7 +529,6 @@ export default { cancelOrder() { cancelOrderHandle(this.orderInfo.orderId) .then(() => { - setTimeout(() => this.goBack(), 300); }) .catch(() => { @@ -582,9 +554,7 @@ export default { }, getOrderStatus: function() { let orderInfo = this.orderInfo || {}, - _status = orderInfo._status || { - _type: 0 - }, + _status = orderInfo._status || { _type: 0 }, status = {}; let type = parseInt(_status._type), delivery_type = orderInfo.deliveryType, @@ -642,7 +612,7 @@ export default { this.orderTypeName = "秒杀订单"; this.orderTypeNameStatus = false; } - this.system_store = res.data.system_store || {}; + this.system_store = res.data.systemStore || {}; this.mapKey = res.data.mapKay; this.setOfflinePayStatus(this.orderInfo.offlinePayStatus); }) @@ -660,6 +630,6 @@ export default { await payOrderHandle(this.orderInfo.orderId, type, that.from); that.getDetail(); } - }, + } }; diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue index 8b04562..33c9cd6 100644 --- a/pages/order/OrderSubmission/index.vue +++ b/pages/order/OrderSubmission/index.vue @@ -1,606 +1,643 @@ diff --git a/pages/orderAdmin/OrderCancellation/index.vue b/pages/orderAdmin/OrderCancellation/index.vue index eb4f597..83a83a9 100644 --- a/pages/orderAdmin/OrderCancellation/index.vue +++ b/pages/orderAdmin/OrderCancellation/index.vue @@ -1,159 +1,156 @@ diff --git a/pages/shop/StoreList/index.vue b/pages/shop/StoreList/index.vue index a0b9de7..79eb3a9 100644 --- a/pages/shop/StoreList/index.vue +++ b/pages/shop/StoreList/index.vue @@ -60,7 +60,7 @@ mapKey " > - --> + --> @@ -77,7 +77,7 @@ const MAPKEY = "mapKey"; export default { name: "storeList", components: { Loading }, - computed: mapGetters(["location"]), + computed: mapGetters(["location", "goName"]), data() { return { page: 1, @@ -101,8 +101,8 @@ export default { // 选中门店 checked(e) { if (this.goName === "orders") { - this.$router.go(-1); //返回上一层 - this.$store.commit("GET_STORE", e); + this.$store.commit("get_store", e); + this.$yrouter.back(); } }, // 获取门店列表数据 @@ -141,14 +141,14 @@ export default { } .storeBox { background-color: #fff; - padding: 0 0.3*100rpx; + padding: 0 0.3 * 100rpx; } .storeBox-box { width: 100%; height: auto; display: flex; align-items: center; - padding: 0.23*100rpx 0; + padding: 0.23 * 100rpx 0; justify-content: space-between; border-bottom: 1px solid #eee; } @@ -159,15 +159,15 @@ export default { } .store-cent-left { width: 45%; - text{ + text { display: block; } } .store-img { - width: 1.2*100rpx; - height: 1.2*100rpx; - border-radius: 0.06*100rpx; - margin-right: 0.22*100rpx; + width: 1.2 * 100rpx; + height: 1.2 * 100rpx; + border-radius: 0.06 * 100rpx; + margin-right: 0.22 * 100rpx; } .store-img img { width: 100%; @@ -175,31 +175,31 @@ export default { } .store-name { color: #282828; - font-size: 0.3*100rpx; - margin-bottom: 0.22*100rpx; + font-size: 0.3 * 100rpx; + margin-bottom: 0.22 * 100rpx; font-weight: 800; } .store-address { color: #666666; - font-size: 0.24*100rpx; + font-size: 0.24 * 100rpx; } .store-phone { - width: 0.5*100rpx; - height: 0.5*100rpx; + width: 0.5 * 100rpx; + height: 0.5 * 100rpx; color: #fff; border-radius: 50%; display: block; text-align: center; - line-height: 0.5*100rpx; + line-height: 0.5 * 100rpx; background-color: #e83323; - margin-bottom: 0.22*100rpx; + margin-bottom: 0.22 * 100rpx; } .store-distance { - font-size: 0.22*100rpx; + font-size: 0.22 * 100rpx; color: #e83323; } .iconfont { - font-size: 0.2*100rpx; + font-size: 0.2 * 100rpx; } .row-right { display: flex; diff --git a/pages/user/UserAccount/index.vue b/pages/user/UserAccount/index.vue index 9ef28da..17852a7 100644 --- a/pages/user/UserAccount/index.vue +++ b/pages/user/UserAccount/index.vue @@ -31,6 +31,12 @@ 消费记录 + + + + + 充值记录 + diff --git a/pages/user/UserBill/index.vue b/pages/user/UserBill/index.vue index fe21e6a..703795b 100644 --- a/pages/user/UserBill/index.vue +++ b/pages/user/UserBill/index.vue @@ -3,6 +3,7 @@ 全部 消费 + 充值 diff --git a/store/index.js b/store/index.js index b4aa03f..670f32d 100644 --- a/store/index.js +++ b/store/index.js @@ -26,7 +26,9 @@ const vuexStore = new Vuex.Store({ location: { latitude: '', longitude: '' - } + }, + storeItems: cookie.get("storeItems") || null, + goName: cookie.get("goName") || "" }, mutations: { login(state, token, expires_time) { @@ -64,8 +66,15 @@ const vuexStore = new Vuex.Store({ state.$deviceType = $deviceType; }, setLocation(state, location) { - console.log(location, '定位') state.location = location + }, + get_store(state, storeItems) { + state.storeItems = storeItems; + cookie.set("storeItems", storeItems); + }, + get_to(state, goName) { + state.goName = goName; + cookie.set("goName", goName); } }, actions: { @@ -139,6 +148,8 @@ const vuexStore = new Vuex.Store({ isLogin: state => !!state.token, userInfo: state => state.userInfo || {}, location: state => state.location, + storeItems: state => state.storeItems, + goName: state => state.goName, }, strict: debug });