diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index bfc78ae..9cba30d 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -6,7 +6,7 @@ { "launchtype" : "remote" }, - "h5" : + "mp-weixin" : { "launchtype" : "remote" }, diff --git a/api/aftersales.js b/api/aftersales.js new file mode 100644 index 0000000..e91e718 --- /dev/null +++ b/api/aftersales.js @@ -0,0 +1,64 @@ +import request from '@/utils/request' + +// 提交售后 +/** + * + 订单号 orderCode; + 服务类型 0仅退款1退货退款 serviceType; + 申请原因 reasonForApplication; + 申请说明 applicationInstructions; + 申请说明图片 applicationDescriptionPicture; + 商品数据 productParamList; + */ +export function submitAfterSealsOrder(data) { + return request.post(`/applyForAfterSales`, data, { + login: true + }); +} + +// 售后订单列表 +export function getAfterSealsList (params) { + return request.get('/storeAfterSales/list', params, { + login: true, + }); +} + +// 售后详情 +export function getAfterSalesDeatail(key) { + return request.get(`/applyForAfterSales/${key}`); +} + +// 查询订单 +export function getAfterSealsDetail (key, id) { + return request.get(`/store/detail/${key}/${id}`) +} + +// 搜索 +export function searchAfterSealsDetail (key) { + return request.get(`/store/detail/${key}`) +} + +// 撤销售后订单 +export function rebackAfterSeals (key, id) { + return request.get(`/revoke/${key}/${id}`) +} + +// 获取物流信息 +export function getExpressData () { + return request.get('/yxExpress') + +} + +// 添加快递单号 +export function addExpressData (params) { + return request.post('/addLogisticsInformation?' + `code=${params.code}&name=${params.name}&postalCode=${params.postalCode}&orderCode=${params.orderCode}&`, '', { + login: true + }) +} + +// 删除售后订单 +export function deleteAfterSeals (params) { + return request.delete('/deleteAfterSalesOrder', params, { + login: true + }) +} diff --git a/api/user.js b/api/user.js index a520d81..32f4512 100644 --- a/api/user.js +++ b/api/user.js @@ -63,7 +63,7 @@ export function register(data) { */ export function registerReset(data) { return request.post('/register/reset', data, { - login: false, + login: true, }) } @@ -403,6 +403,14 @@ export function wxappBindingPhone(data) { return request.post('wxapp/binding', data) } +/** + * 小程序授权 + */ +export function wxappGetUserInfo (data) { + return request.post('/wxapp/loginAuth', data) + //return request.get('/wechat/auth', data) +} + /* * h5切换公众号登陆 * */ diff --git a/components/CountDown.vue b/components/CountDown.vue index cec9316..c616d0a 100644 --- a/components/CountDown.vue +++ b/components/CountDown.vue @@ -42,8 +42,9 @@ export default { default: true, }, }, - data: function() { + data() { return { + timeInterval: null, time: this.datatime, day: '00', hour: '00', @@ -51,7 +52,7 @@ export default { second: '00', } }, - created: function() { + created() { this.show_time() }, watch: { @@ -61,10 +62,11 @@ export default { this.show_time() }, }, - mounted: function() {}, + mounted() { + }, methods: { - show_time: function() { - let that = this + show_time() { + console.log(this.datatime) if (this.time.toString().length == 13) { // 毫秒级 console.log('毫秒') @@ -77,41 +79,43 @@ export default { console.log('时间') this.time = Date.parse(this.time) / 1000 } - - function runTime() { - //时间函数 - let intDiff = that.time - Date.parse(new Date()) / 1000 //获取数据中的时间戳的时间差; - let day = 0, - hour = 0, - minute = 0, - second = 0 - if (intDiff > 0) { - //转换时间 - if (that.isDay === true) { - day = Math.floor(intDiff / (60 * 60 * 24)) - } else { - day = 0 - } - hour = Math.floor(intDiff / (60 * 60)) - day * 24 - minute = Math.floor(intDiff / 60) - day * 24 * 60 - hour * 60 - second = Math.floor(intDiff) - day * 24 * 60 * 60 - hour * 60 * 60 - minute * 60 - if (hour <= 9) hour = '0' + hour - if (minute <= 9) minute = '0' + minute - if (second <= 9) second = '0' + second - that.day = day - that.hour = hour - that.minute = minute - that.second = second - } else { - that.day = '00' - that.hour = '00' - that.minute = '00' - that.second = '00' - } - } - runTime() - this.timeInterval = setInterval(runTime, 1000) + this.runTime() + this.timeInterval = setInterval(this.runTime, 1000) }, + runTime() { + //时间函数 + let intDiff = this.time - Date.parse(new Date()) / 1000 //获取数据中的时间戳的时间差 + let day = 0, + hour = 0, + minute = 0, + second = 0 + if (intDiff > 0) { + //转换时间 + if (this.isDay === true) { + day = Math.floor(intDiff / (60 * 60 * 24)) + } else { + day = 0 + } + hour = Math.floor(intDiff / (60 * 60)) - day * 24 + minute = Math.floor(intDiff / 60) - day * 24 * 60 - hour * 60 + second = Math.floor(intDiff) - day * 24 * 60 * 60 - hour * 60 * 60 - minute * 60 + if (hour <= 9) hour = '0' + hour + if (minute <= 9) minute = '0' + minute + if (second <= 9) second = '0' + second + this.day = day + this.hour = hour + this.minute = minute + this.second = second + } else { + this.day = '00' + this.hour = '00' + this.minute = '00' + this.second = '00' + } + } }, + destroyed() { + clearTimeout(this.timeInterval) + } } diff --git a/components/ProductWindow.vue b/components/ProductWindow.vue index 0dda009..3bdf3f6 100644 --- a/components/ProductWindow.vue +++ b/components/ProductWindow.vue @@ -83,6 +83,7 @@ export default { return {}; }, mounted: function () { + console.log(this.attr) console.log(this); }, watch: { diff --git a/config/index.js b/config/index.js index d4da139..efe7fa5 100644 --- a/config/index.js +++ b/config/index.js @@ -1,5 +1,6 @@ // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; -export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api' +// export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api' +export const VUE_APP_API_URL = '/h5api' // export const VUE_APP_API_URL = 'http://139.186.134.205:9006/api' // export const VUE_APP_API_URL = 'http://192.168.31.223:8008/api' // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; diff --git a/manifest.json b/manifest.json index 2d5cf21..eb52bbd 100644 --- a/manifest.json +++ b/manifest.json @@ -69,11 +69,115 @@ "UniversalLinks": "https://yixiang.co/app/" } }, - "share": { - "weixin": { - "appid": "wx7c84ede33062d1e4", - "UniversalLinks": "https://yixiang.co/app/" - } + /* 应用发布信息 */ + "distribute" : { + /* android打包配置 */ + "android" : { + "permissions" : [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ] + }, + /* ios打包配置 */ + "ios" : {}, + /* SDK配置 */ + "sdkConfigs" : { + "oauth" : { + "weixin" : { + "appid" : "wx7c84ede33062d1e4", + "appsecret" : "c47ef66d3311194da44e60387d5c1abd", + "UniversalLinks" : "https://yixiang.co/app/" + } + }, + "payment" : { + "weixin" : { + "appid" : "wx7c84ede33062d1e4", + "UniversalLinks" : "https://yixiang.co/app/" + } + }, + "share" : { + "weixin" : { + "appid" : "wx7c84ede33062d1e4", + "UniversalLinks" : "https://yixiang.co/app/" + } + }, + "ad" : {}, + "geolocation" : {} + }, + "splashscreen" : { + "ios" : { + "iphone" : { + "portrait-896h@3x" : "splash/1242+2688.png", + "portrait-896h@2x" : "splash/828+1792.png", + "iphonex" : "splash/1125+2436.png", + "retina55" : "splash/1142+2208.png", + "retina47" : "splash/750+1334.png", + "retina40" : "splash/640+1136.png", + "retina35" : "splash/640+960.png" + } + }, + "android" : { + "hdpi" : "splash/480+762.png", + "xhdpi" : "splash/720+1242.png", + "xxhdpi" : "splash/1080+1882.png" + }, + "iosStyle" : "common" + }, + "icons" : { + "android" : { + "hdpi" : "icons/72x72.png", + "xhdpi" : "icons/96x96.png", + "xxhdpi" : "icons/144x144.png", + "xxxhdpi" : "icons/192x192.png" + }, + "ios" : { + "appstore" : "icons/1024x1024.png", + "ipad" : { + "app" : "icons/76x76.png", + "app@2x" : "icons/152x152.png", + "notification" : "icons/20x20.png", + "notification@2x" : "icons/40x40.png", + "proapp@2x" : "icons/167x167.png", + "settings" : "icons/29x29.png", + "settings@2x" : "icons/58x58.png", + "spotlight" : "icons/40x40.png", + "spotlight@2x" : "icons/80x80.png" + }, + "iphone" : { + "app@2x" : "icons/120x120.png", + "app@3x" : "icons/180x180.png", + "notification@2x" : "icons/40x40.png", + "notification@3x" : "icons/60x60.png", + "settings@2x" : "icons/58x58.png", + "settings@3x" : "icons/87x87.png", + "spotlight@2x" : "icons/80x80.png", + "spotlight@3x" : "icons/120x120.png" + } + } + } + } + }, + "quickapp" : {}, + "mp-weixin" : { + "appid" : "wx604d2ea4702620d2", + "setting" : { + "urlCheck" : true, + "postcss" : true, + "minified" : true }, "ad": {}, "geolocation": {} @@ -179,13 +283,32 @@ "router": { "mode": "history" }, - "sdkConfigs": { - "maps": { - "qqmap": { - "key": "" - } - } - }, - "domain": "h5.yixiang.co" - } + "h5" : { + "title" : "yshop", + "devServer" : { + "disableHostCheck" : true, + "proxy" : { + "/h5api" : { + // 需要被代理的后台地址 + "target" : "http://itxzz.51vip.biz/", + "changeOrigin" : true, + "secure" : false, + "pathRewrite" : { + "^/h5api" : "/api" + } + } + } + }, + "router" : { + "mode" : "history" + }, + "sdkConfigs" : { + "maps" : { + "qqmap" : { + "key" : "" + } + } + }, + "domain" : "h5.yixiang.co" + } } diff --git a/pages.json b/pages.json index e310355..e1ca664 100644 --- a/pages.json +++ b/pages.json @@ -25,7 +25,8 @@ } }, { - "path": "pages/user/RetrievePassword/index", + // "path": "pages/user/RetrievePassword/index", + "path": "pages/user/ChangePassword/index", "style": { "navigationBarTitleText": "重置密码" } @@ -296,6 +297,12 @@ "navigationBarTitleText": "订单详情" } }, + { + "path" : "pages/order/OrderReturnDetail/index", + "style": { + "navigationBarTitleText": "售后详情" + } + }, { "path": "pages/order/OrderSubmission/index", "style": { @@ -317,9 +324,15 @@ { "path": "pages/order/ReturnList/index", "style": { - "navigationBarTitleText": "退货列表" + "navigationBarTitleText": "我的售后" } }, + { + "path": "pages/order/submitExpress/index", + "style": { + "navigationBarTitleText": "售后物流填写" + } + }, { "path": "pages/orderAdmin/OrderIndex/index", "style": { @@ -422,7 +435,7 @@ "navigationBarTitleText": "直播列表" } } - ], + ], "easycom": { "autoscan": true, "custom": { diff --git a/pages/activity/DargainDetails/index.vue b/pages/activity/DargainDetails/index.vue index c1930d0..7928690 100644 --- a/pages/activity/DargainDetails/index.vue +++ b/pages/activity/DargainDetails/index.vue @@ -38,8 +38,8 @@ - - + + @@ -51,9 +51,9 @@ - + 砍价成功 - + diff --git a/pages/activity/GoodsGroup/index.vue b/pages/activity/GoodsGroup/index.vue index dac8abb..5cbeddc 100644 --- a/pages/activity/GoodsGroup/index.vue +++ b/pages/activity/GoodsGroup/index.vue @@ -9,7 +9,8 @@ - + TOP{{ index + 1 }} @@ -22,7 +23,9 @@ {{ groupon.people || 0 }}人团 - + + diff --git a/pages/activity/GoodsSeckill/index.vue b/pages/activity/GoodsSeckill/index.vue index 60df6de..3923b37 100644 --- a/pages/activity/GoodsSeckill/index.vue +++ b/pages/activity/GoodsSeckill/index.vue @@ -3,6 +3,7 @@ + @@ -37,7 +38,7 @@ 距离{{ item.status == 1 ? '结束还剩' : '开始还有' }} - + @@ -163,6 +164,7 @@ export default { that.status = false that.active = index that.datatime = that.timeList[that.active].stop + console.log(new Date(that.datatime)) this.seckillList = [] that.getSeckillList() }, @@ -212,6 +214,9 @@ export default { position: fixed; left: 0; top: 0; + /* #ifdef H5 */ + top: 80rpx; + /* #endif */ z-index: 1; } @@ -221,6 +226,9 @@ export default { position: fixed; left: 0; top: 0; + /* #ifdef H5 */ + top: 80rpx; + /* #endif */ z-index: 3; overflow: hidden; } diff --git a/pages/activity/GroupDetails/index.vue b/pages/activity/GroupDetails/index.vue index 5cfd5c1..cac09b4 100644 --- a/pages/activity/GroupDetails/index.vue +++ b/pages/activity/GroupDetails/index.vue @@ -260,7 +260,7 @@ export default { }, methods: { formatPrice(price, index) { - console.log(price) + // console.log(price) if (price) { return price.split('.')[index] } @@ -284,15 +284,6 @@ export default { }, } }, - openAlone: function() { - this.$yrouter.push({ - path: '/pages/shop/GoodsCon/index', - query: { - id: this.storeInfo.productId, - }, - }) - // this.$yrouter.replace({ path: "/detail/" + this.storeInfo.productId }); - }, //收藏商品 setCollect: function() { let that = this, @@ -452,24 +443,41 @@ export default { this.$set(this, 'attrTxt', '请选择') } }, - + // 单独购买 + openAlone: function() { + this.$yrouter.push({ + path: '/pages/shop/GoodsCon/index', + query: { + id: this.storeInfo.productId, + }, + }) + // this.$yrouter.replace({ path: "/detail/" + this.storeInfo.productId }); + }, + // 发起拼团 openTeam: function() { var that = this - if (that.attr.cartAttr == false) { + console.log(this.attr) + if (that.attr.cartAttr == false) { // 展示弹框 + console.log(this.attr.cartAttr) that.attr.cartAttr = !this.attr.cartAttr - } else { + // 设置拼团价格 + that.attr.productSelect.price = this.storeInfo.price + } else { // 已有弹框——初始化商品信息,下单请求 var data = {} data.productId = that.storeInfo.productId + data.price = that.storeInfo.price data.cartNum = that.attr.productSelect.cart_num data.uniqueId = that.attr.productSelect.unique data.combinationId = that.storeInfo.id data.new = 1 + console.log(data) postCartAdd(data) .then(res => { that.$yrouter.push({ path: '/pages/order/OrderSubmission/index', query: { - id: res.data.cartId, + // id: res.data.cartId, + pinkId: res.data.cartId, }, }) }) diff --git a/pages/activity/GroupRule/index.vue b/pages/activity/GroupRule/index.vue index 3c3aea4..27e5346 100644 --- a/pages/activity/GroupRule/index.vue +++ b/pages/activity/GroupRule/index.vue @@ -7,11 +7,11 @@ - {{ storeCombination.price.split('.')[0] }} - .{{ storeCombination.price.split('.')[1] }} + {{ storeCombination.price.split('.')[0] || 0 }} + .{{ storeCombination.price.split('.')[1] || 0 }} - {{ storeCombination.people }}人团 + {{ storeCombination.people || 0 }}人团 @@ -96,15 +96,14 @@ export default { } }, }, - mounted: function() { - var that = this + mounted() { let url = handleQrCode() if (url) { - that.pinkId = url.pinkId + this.pinkId = url.pinkId } else { - that.pinkId = that.$yroute.query.id + this.pinkId = this.$yroute.query.id } - that.getCombinationPink() + this.getCombinationPink() }, methods: { pay: function() { diff --git a/pages/activity/Poster/index.vue b/pages/activity/Poster/index.vue index 88874cb..2548409 100644 --- a/pages/activity/Poster/index.vue +++ b/pages/activity/Poster/index.vue @@ -1,10 +1,17 @@ @@ -18,73 +25,95 @@ name: "Poster", components: {}, props: {}, - data: function () { + data () { return { status: true, id: 0, image: "" }; }, - mounted: function () { - var that = this; - var id = that.$yroute.query.id; - var type = that.$yroute.query.type; - that.id = id; + mounted () { + var id = this.$yroute.query.id; + var type = this.$yroute.query.type; + this.id = id; if (type == 2) { - that.getBargainPoster(); + this.getBargainPoster(); } else { - that.getCombinationPoster(); + this.getCombinationPoster(); } }, methods: { - // 砍价海报 - getBargainPoster: function () { - var that = this; - let from = this.$deviceType - if (from == 'weixin' || this.$deviceType == 'weixinh5') { - from = 'uniappH5' - } - getBargainPoster({ - bargainId: that.id, - from - }) - .then(res => { - that.image = res.data.url; - that.status = false; - }) - .catch(res => { - uni.showToast({ - title: res.msg, - icon: "none", - duration: 2000 - }); - }); - }, - // 拼团海报 - getCombinationPoster: function () { - var that = this; - console.log(this.$deviceType) - let from = this.$deviceType - if (from == 'weixin' || this.$deviceType == 'weixinh5') { - from = 'uniappH5' - } - console.log(from) - getCombinationPoster({ - id: that.id, - from - }) - .then(res => { - that.image = res.data.url; - that.status = false; - }) - .catch(res => { - uni.showToast({ - title: res.msg, - icon: "none", - duration: 2000 - }); - }); - } + // 砍价海报 + getBargainPoster: function () { + var that = this; + let from = this.$deviceType + if (from == 'weixin' || this.$deviceType == 'weixinh5') { + from = 'uniappH5' + } + getBargainPoster({ + bargainId: that.id, + from + }) + .then(res => { + that.image = res.data.url; + that.status = false; + }) + .catch(res => { + uni.showToast({ + title: res.msg, + icon: "none", + duration: 2000 + }); + }); + }, + // 拼团海报 + getCombinationPoster: function () { + var that = this; + console.log(this.$deviceType) + let from = this.$deviceType + if (from == 'weixin' || this.$deviceType == 'weixinh5') { + from = 'uniappH5' + } + console.log(from) + getCombinationPoster({ + id: that.id, + from + }) + .then(res => { + that.image = res.data.url; + that.status = false; + }) + .catch(res => { + uni.showToast({ + title: res.msg, + icon: "none", + duration: 2000 + }); + }); + }, + // app端长按保存 + longtap () { + // 先下载图片 + uni.downloadFile({ + url: this.img, + success: (res) => { + // 获取到图片本地地址后再保存图片到相册(因为此方法不支持远程地址) + uni.saveImageToPhotosAlbum({ + filePath: res.tempFilePath, + success: () => { + uni.showToast({ + title: "保存成功!", + }); + }, + fail: () => { + uni.showToast({ + title: "保存失败", + }); + }, + }); + }, + }); + } } }; diff --git a/pages/authorization/index.vue b/pages/authorization/index.vue index 6e509ca..7c43a22 100644 --- a/pages/authorization/index.vue +++ b/pages/authorization/index.vue @@ -6,10 +6,14 @@ @@ -27,27 +31,28 @@ + + diff --git a/pages/order/GoodsReturn/productlist.vue b/pages/order/GoodsReturn/productlist.vue new file mode 100644 index 0000000..21f0243 --- /dev/null +++ b/pages/order/GoodsReturn/productlist.vue @@ -0,0 +1,39 @@ + + + + + diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue index 6b35183..d45f839 100644 --- a/pages/order/OrderDetails/index.vue +++ b/pages/order/OrderDetails/index.vue @@ -4,7 +4,7 @@ {{ orderInfo._status._msg }} - {{ orderInfo.createTime }} + {{ orderInfo.createTime || '' }} - + 订单编号: - {{ orderInfo.orderId }} - - 复制 - + {{ orderInfo.orderId || '' }} + + 复制 + 下单时间: - {{ orderInfo.createTime }} + {{ orderInfo.createTime || '' }} 订单类型: - {{ orderTypeName }} + {{ orderTypeName || '' }} 支付状态: @@ -139,11 +150,11 @@ 支付方式: - {{ orderInfo._status._payType }} + {{ orderInfo._status._payType || '' }} 买家留言: - {{ orderInfo.mark }} + {{ orderInfo.mark || '' }} @@ -185,42 +196,42 @@ 收货人: - {{ orderInfo.realName }} + {{ orderInfo.realName || '' }} 联系电话: - {{ orderInfo.userPhone }} + {{ orderInfo.userPhone || '' }} 收货地址: - {{ orderInfo.userAddress }} + {{ orderInfo.userAddress || '' }} 支付金额: - ¥{{ orderInfo.totalPrice }} + ¥{{ orderInfo.totalPrice || 0 }} 支付积分: - {{ orderInfo.payIntegral }}积分 + {{ orderInfo.payIntegral || 0 }}积分 优惠券抵扣: - -¥{{ orderInfo.couponPrice }} + -¥{{ orderInfo.couponPrice ||0 }} 积分抵扣: - -¥{{ orderInfo.deductionPrice }} + -¥{{ orderInfo.deductionPrice || 0 }} 运费: - ¥{{ orderInfo.payPostage }} + ¥{{ orderInfo.payPostage || 0 }} 实付款: - ¥{{ orderInfo.payPrice }} - {{ orderInfo.payIntegral }}积分 + ¥{{ orderInfo.payPrice || 0 }} + {{ orderInfo.payIntegral || 0 }}积分 @@ -229,13 +240,19 @@ 取消订单 立即付款 - @@ -325,6 +352,7 @@ }, methods: { copyClipboard, + // 申请退款 goGoodsReturn(orderInfo) { this.$yrouter.push({ path: "/pages/order/GoodsReturn/index", @@ -494,7 +522,6 @@ }, async toPay(type) { var that = this; - console.log(type, "支付方式"); await payOrderHandle(this.orderInfo.orderId, type, that.from); that.getDetail(); }, diff --git a/pages/order/OrderReturnDetail/index.vue b/pages/order/OrderReturnDetail/index.vue new file mode 100644 index 0000000..495a249 --- /dev/null +++ b/pages/order/OrderReturnDetail/index.vue @@ -0,0 +1,334 @@ + + + + + diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue index ba2aacf..9f5ace4 100644 --- a/pages/order/OrderSubmission/index.vue +++ b/pages/order/OrderSubmission/index.vue @@ -21,23 +21,23 @@ -
-
-
+ + + {{ storeItems.name }} {{ storeItems.phone }} -
-
{{ storeItems.address }}
-
-
-
+ + {{ storeItems.address }} + + + {{ systemStore.name }} {{ systemStore.phone }} -
-
{{ systemStore.address }}
-
-
-
+ + {{ systemStore.address }} + + + @@ -312,9 +312,9 @@ export default { }, onLoad: function() { let that = this - console.log('loadddddddd') this.$store.dispatch('getUser', true) that.getCartInfo() + console.log(that.$yroute) if (that.$yroute.query.pinkid !== undefined) { that.pinkId = that.$yroute.query.pinkid @@ -355,6 +355,7 @@ export default { } this.useIntegral = e.mp.detail.value[0] }, + // 计算商品价格 computedPrice() { let shipping_type = this.shipping_type postOrderComputed(this.orderGroupInfo.orderKey, { @@ -377,7 +378,11 @@ export default { }) }, getCartInfo() { - const cartIds = this.$yroute.query.id + let cartIds = this.$yroute.query.id + // 拼团id + if (this.$yroute.query.pinkId) { + cartIds = this.$yroute.query.pinkId + } if (!cartIds) { uni.showToast({ title: '参数有误', @@ -388,8 +393,6 @@ export default { } postOrderConfirm(cartIds) .then(res => { - console.log(res, 999999) - console.log(res.data.systemStore || {}, 999999) this.offlinePayStatus = res.data.offline_pay_status this.orderGroupInfo = res.data this.deduction = res.data.deduction diff --git a/pages/order/ReturnList/index.vue b/pages/order/ReturnList/index.vue index c72190e..25f25ca 100644 --- a/pages/order/ReturnList/index.vue +++ b/pages/order/ReturnList/index.vue @@ -1,38 +1,25 @@ + + diff --git a/pages/user/Login/index.vue b/pages/user/Login/index.vue index 0007dd1..6086581 100644 --- a/pages/user/Login/index.vue +++ b/pages/user/Login/index.vue @@ -1,57 +1,58 @@