From 4a31c765eabc391b890bc6659c89361f1bc79eae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B9=85=E4=BF=9D=E5=90=8C=E5=AD=A6?= <3228274159@qq.com> Date: Wed, 26 Jun 2024 15:11:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=81=9C=E8=BD=A6=E4=BC=98=E6=83=A0=E5=88=B8?= =?UTF-8?q?=E5=AE=8C=E6=88=90=EF=BC=8C=E6=84=8F=E8=A7=81=E5=8F=8D=E9=A6=88?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/api.js | 6 +- main.js | 2 +- pages/Coupons/Coupons.vue | 12 +- pages/my/my.vue | 4 + pages/myIntegral/myIntegral.vue | 205 +++++++++++------- pages/yijian/yijian.vue | 54 ++++- stor/index.js | 24 +- unpackage/dist/dev/mp-weixin/api/api.js | 4 + unpackage/dist/dev/mp-weixin/app.js | 1 + .../dev/mp-weixin/pages/Coupons/Coupons.js | 26 ++- .../dev/mp-weixin/pages/Coupons/Coupons.wxml | 2 +- unpackage/dist/dev/mp-weixin/pages/my/my.js | 4 + .../mp-weixin/pages/myIntegral/myIntegral.js | 4 +- .../pages/myIntegral/myIntegral.wxml | 2 +- .../pages/myIntegral/myIntegral.wxss | 9 +- .../dist/dev/mp-weixin/pages/yijian/yijian.js | 31 ++- .../dev/mp-weixin/pages/yijian/yijian.wxml | 2 +- .../dev/mp-weixin/pages/yijian/yijian.wxss | 14 ++ unpackage/dist/dev/mp-weixin/stor/index.js | 21 ++ .../dist/dev/mp-weixin/utils/interceptor.js | 27 +++ utils/interceptor.js | 2 +- 21 files changed, 342 insertions(+), 114 deletions(-) create mode 100644 unpackage/dist/dev/mp-weixin/utils/interceptor.js diff --git a/api/api.js b/api/api.js index 643f4b4..1ede55d 100644 --- a/api/api.js +++ b/api/api.js @@ -97,4 +97,8 @@ export const getexChange=(data)=>reqs(`shop/device-commodity/commodity-exchange` //获取积分明细 export const getCardUpdateInfo=(data)=>requests(`mobile/order/cardUpdateInfo`,data,"GET") //使用优惠券 -export const getyouHui=(data)=>requests(`mobile/coupon/useCoupon`,data,"GET") \ No newline at end of file +export const getyouHui=(data)=>requests(`mobile/coupon/useCoupon`,data,"GET") +//获取停车场优惠券 +export const getTincheCoupons = (data)=>reqs('shop/preferential-card/park-card-get',data,"GET") +//添加建议 +export const getAdd = (data)=>requests('mobile/recommendation/add',data,"POST") \ No newline at end of file diff --git a/main.js b/main.js index f2ad493..b54d8e4 100644 --- a/main.js +++ b/main.js @@ -2,7 +2,7 @@ import App from './App' import {createPinia}from 'pinia' import {request} from './utils/request.js' import share from './utils/shore.js' -// import '@/utils/interceptor.js' +import '@/utils/interceptor.js' // #ifndef VUE3 import Vue from 'vue' diff --git a/pages/Coupons/Coupons.vue b/pages/Coupons/Coupons.vue index 8cdb4e9..c2a718a 100644 --- a/pages/Coupons/Coupons.vue +++ b/pages/Coupons/Coupons.vue @@ -15,10 +15,10 @@ - + - 新 - 拉新券 + 新 + 拉新券 @@ -38,7 +38,7 @@ 使用 - + + 团 团购券 diff --git a/pages/my/my.vue b/pages/my/my.vue index e8c96ad..1ec8f80 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -213,6 +213,10 @@ phoneNum.value = prefix + '*****' + suffix; console.log(phoneNum.value); + }else{ + uni.navigateTo({ + url:"/pages/login/login" + }) } // isUser() }) diff --git a/pages/myIntegral/myIntegral.vue b/pages/myIntegral/myIntegral.vue index f27f740..ae16694 100644 --- a/pages/myIntegral/myIntegral.vue +++ b/pages/myIntegral/myIntegral.vue @@ -1,8 +1,8 @@ + \ No newline at end of file diff --git a/pages/yijian/yijian.vue b/pages/yijian/yijian.vue index bd10360..40c170b 100644 --- a/pages/yijian/yijian.vue +++ b/pages/yijian/yijian.vue @@ -1,17 +1,20 @@ @@ -20,9 +23,35 @@ import { ref } from 'vue' + import{getAdd} from '../../api/api' const titles = ref('意见反馈') const bgcolor = ref('#fff') const color = ref('#000') + const yijian = ref("") + const tel = ref("") + + const btnSumit = ()=>{ + let phoneNumberPattern = /^(?:(?:\+|00)86)?1[3-9]\d{9}$/; + if(tel.value.match(phoneNumberPattern)){ + getAdd({phoneNumber:tel.value,recommendation:yijian.value}).then(res=>{ + console.log(res); + if(res.code===200){ + uni.showToast({ + icon:"none", + title:"提交成功", + duration:1000 + }) + } + }) + }else{ + uni.showToast({ + icon:"none", + title:"请输入正确的手机号码", + duration:1000 + }) + } + + } \ No newline at end of file diff --git a/stor/index.js b/stor/index.js index 458d34f..85dc742 100644 --- a/stor/index.js +++ b/stor/index.js @@ -13,7 +13,8 @@ import { getBy, getTimeStamps, start, - shop + shop, + getTincheCoupons } from '../api/api.js' import dayjs from 'dayjs' export const storindex = defineStore('storindex', () => { @@ -88,6 +89,13 @@ export const storindex = defineStore('storindex', () => { p.value = 0 } else { console.log("out_trade_no", res); + const qaq = await getTincheCoupons({ + phoneNumber: uni.getStorageSync('phoneNumber') + }) + uni.showToast({ + icon:"none", + title:`${qaq.data[0]}` + }) const res1 = await getWxPlay({ appId: appid, phone: uni.getStorageSync('phoneNumber'), @@ -353,6 +361,13 @@ export const storindex = defineStore('storindex', () => { }) p.value = 0 } else { + const qaq = await getTincheCoupons({ + phoneNumber: uni.getStorageSync('phoneNumber') + }) + uni.showToast({ + icon:"none", + title:`${qaq.data[0]}` + }) const res4 = await start({ mid: uni.getStorageSync('mid'), price: 100, @@ -415,6 +430,13 @@ export const storindex = defineStore('storindex', () => { }) p.value = 0 } else { + const qaq = await getTincheCoupons({ + phoneNumber: uni.getStorageSync('phoneNumber') + }) + uni.showToast({ + icon:"none", + title:`${qaq.data[0]}` + }) const res4 = await start({ mid: uni.getStorageSync('mid'), price: 100, diff --git a/unpackage/dist/dev/mp-weixin/api/api.js b/unpackage/dist/dev/mp-weixin/api/api.js index 3333c1d..b5389f0 100644 --- a/unpackage/dist/dev/mp-weixin/api/api.js +++ b/unpackage/dist/dev/mp-weixin/api/api.js @@ -34,11 +34,14 @@ const getCommodityShop = (data) => utils_request.reqs(`shop/device-commodity/lis const getexChange = (data) => utils_request.reqs(`shop/device-commodity/commodity-exchange`, data, "POST"); const getCardUpdateInfo = (data) => utils_request.requests(`mobile/order/cardUpdateInfo`, data, "GET"); const getyouHui = (data) => utils_request.requests(`mobile/coupon/useCoupon`, data, "GET"); +const getTincheCoupons = (data) => utils_request.reqs("shop/preferential-card/park-card-get", data, "GET"); +const getAdd = (data) => utils_request.requests("mobile/recommendation/add", data, "POST"); exports.GetBranchInformation = GetBranchInformation; exports.GetCarList = GetCarList; exports.GetInformation = GetInformation; exports.Getnetworklist = Getnetworklist; exports.getAccessToken = getAccessToken; +exports.getAdd = getAdd; exports.getBalancea = getBalancea; exports.getBalanceaOrder = getBalanceaOrder; exports.getBalanceaOrderUpdata = getBalanceaOrderUpdata; @@ -59,6 +62,7 @@ exports.getRecharges = getRecharges; exports.getRechargesCard = getRechargesCard; exports.getShopid = getShopid; exports.getTimeStamps = getTimeStamps; +exports.getTincheCoupons = getTincheCoupons; exports.getWxPlay = getWxPlay; exports.getaddCar = getaddCar; exports.getexChange = getexChange; diff --git a/unpackage/dist/dev/mp-weixin/app.js b/unpackage/dist/dev/mp-weixin/app.js index 8a8b546..9bc3947 100644 --- a/unpackage/dist/dev/mp-weixin/app.js +++ b/unpackage/dist/dev/mp-weixin/app.js @@ -2,6 +2,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" }); const common_vendor = require("./common/vendor.js"); const utils_shore = require("./utils/shore.js"); +require("./utils/interceptor.js"); if (!Math) { "./pages/index/index.js"; "./pages/handle/handle.js"; diff --git a/unpackage/dist/dev/mp-weixin/pages/Coupons/Coupons.js b/unpackage/dist/dev/mp-weixin/pages/Coupons/Coupons.js index 41b119e..ba75c86 100644 --- a/unpackage/dist/dev/mp-weixin/pages/Coupons/Coupons.js +++ b/unpackage/dist/dev/mp-weixin/pages/Coupons/Coupons.js @@ -43,18 +43,20 @@ const _sfc_main = { e: common_vendor.o(add), f: common_vendor.f(common_vendor.unref(couponsData), (item, index, i0) => { return common_vendor.e({ - a: item.status === 0 && headerindex.value === 1 - }, item.status === 0 && headerindex.value === 1 ? { - b: common_vendor.t(item.couponName), - c: common_vendor.t(item.endTime), - d: common_vendor.t(item.rule), - e: common_vendor.o(($event) => xiche(index), item.id) - } : {}, { - f: item.status === 2 && headerindex.value === 2 - }, item.status === 2 && headerindex.value === 2 ? {} : {}, { - g: item.status === 2 && headerindex.value === 2 - }, item.status === 2 && headerindex.value === 2 ? {} : {}, { - h: item.id + a: item.status === 1 && headerindex.value === 1 + }, item.status === 1 && headerindex.value === 1 ? common_vendor.e({ + b: item.couponName === "拉新洗车券" + }, item.couponName === "拉新洗车券" ? {} : {}, { + c: item.couponName === "拉新洗车券" + }, item.couponName === "拉新洗车券" ? {} : {}, { + d: common_vendor.t(item.couponName), + e: common_vendor.t(item.endTime), + f: common_vendor.t(item.rule), + g: common_vendor.o(($event) => xiche(index), item.id) + }) : {}, { + h: item.status === 0 && headerindex.value === 2 + }, item.status === 0 && headerindex.value === 2 ? {} : {}, { + i: item.id }); }) }; diff --git a/unpackage/dist/dev/mp-weixin/pages/Coupons/Coupons.wxml b/unpackage/dist/dev/mp-weixin/pages/Coupons/Coupons.wxml index a2df800..0c17994 100644 --- a/unpackage/dist/dev/mp-weixin/pages/Coupons/Coupons.wxml +++ b/unpackage/dist/dev/mp-weixin/pages/Coupons/Coupons.wxml @@ -1 +1 @@ - 可用券 失效券 新拉新券{{item.b}}{{item.c}}{{item.d}} 使用 团团购券 抖音团购20元券 2020.06.09-2020.07.31 每次上线使用20分钟 团团购券 抖音团购20元券 2020.06.09-2020.07.31 每次上线使用20分钟 \ No newline at end of file + 可用券 失效券 新拉新券{{item.d}}{{item.e}}{{item.f}} 使用 团团购券 抖音团购20元券 2020.06.09-2020.07.31 每次上线使用20分钟 \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/my/my.js b/unpackage/dist/dev/mp-weixin/pages/my/my.js index 8d35cab..89d15f8 100644 --- a/unpackage/dist/dev/mp-weixin/pages/my/my.js +++ b/unpackage/dist/dev/mp-weixin/pages/my/my.js @@ -40,6 +40,10 @@ const _sfc_main = { const suffix = phoneNum.value.slice(3 + 5); phoneNum.value = prefix + "*****" + suffix; console.log(phoneNum.value); + } else { + common_vendor.index.navigateTo({ + url: "/pages/login/login" + }); } }); common_vendor.onShow(() => { diff --git a/unpackage/dist/dev/mp-weixin/pages/myIntegral/myIntegral.js b/unpackage/dist/dev/mp-weixin/pages/myIntegral/myIntegral.js index 2dc045b..5013d21 100644 --- a/unpackage/dist/dev/mp-weixin/pages/myIntegral/myIntegral.js +++ b/unpackage/dist/dev/mp-weixin/pages/myIntegral/myIntegral.js @@ -7,7 +7,9 @@ const _sfc_main = { setup(__props) { const m = stor_my_my.my(); m.getInformation(); - const { Information } = common_vendor.storeToRefs(m); + const { + Information + } = common_vendor.storeToRefs(m); const s = stor_shop_shop.shopStor(); s.getShopData(); const { diff --git a/unpackage/dist/dev/mp-weixin/pages/myIntegral/myIntegral.wxml b/unpackage/dist/dev/mp-weixin/pages/myIntegral/myIntegral.wxml index ed92159..cbe8266 100644 --- a/unpackage/dist/dev/mp-weixin/pages/myIntegral/myIntegral.wxml +++ b/unpackage/dist/dev/mp-weixin/pages/myIntegral/myIntegral.wxml @@ -1 +1 @@ -积分明细 积分说明 > 我的总积分 {{b}}{{c}} 积分获取 积分使用 月总获取积分：1234 月总获取积分：1234 {{item.a}}{{item.b}} +{{item.c}}{{item.a}}{{item.b}} -{{item.c}} 请选择日期 {{item.a}} \ No newline at end of file +积分明细 积分说明 > 我的总积分 {{b}}{{c}} 积分获取 积分使用 月总获取积分：1234 月总获取积分：1234 {{item.a}}{{item.b}} +{{item.c}}{{item.a}}{{item.b}} -{{item.c}} 请选择日期 {{item.a}} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/myIntegral/myIntegral.wxss b/unpackage/dist/dev/mp-weixin/pages/myIntegral/myIntegral.wxss index c3e2d17..fb48e1a 100644 --- a/unpackage/dist/dev/mp-weixin/pages/myIntegral/myIntegral.wxss +++ b/unpackage/dist/dev/mp-weixin/pages/myIntegral/myIntegral.wxss @@ -252,17 +252,22 @@ left: 50%; transform: translate(-50%, -50%); width: 500rpx; + max-height: 800rpx; background-color: white; border-bottom: 1rpx solid #ccc; } -.windowYear .box .title { +.windowYear .box .boxs { + width: 100%; + position: relative; +} +.windowYear .box .boxs .title { font-size: 36rpx; width: 100%; height: 100rpx; line-height: 100rpx; text-align: center; } -.windowYear .box .box-flexs { +.windowYear .box .boxs .box-flexs { width: 100%; height: 100rpx; text-align: center; diff --git a/unpackage/dist/dev/mp-weixin/pages/yijian/yijian.js b/unpackage/dist/dev/mp-weixin/pages/yijian/yijian.js index db1d57b..71362b0 100644 --- a/unpackage/dist/dev/mp-weixin/pages/yijian/yijian.js +++ b/unpackage/dist/dev/mp-weixin/pages/yijian/yijian.js @@ -1,5 +1,6 @@ "use strict"; const common_vendor = require("../../common/vendor.js"); +const api_api = require("../../api/api.js"); if (!Array) { const _easycom_navigationStyle2 = common_vendor.resolveComponent("navigationStyle"); _easycom_navigationStyle2(); @@ -14,13 +15,41 @@ const _sfc_main = { const titles = common_vendor.ref("意见反馈"); const bgcolor = common_vendor.ref("#fff"); const color = common_vendor.ref("#000"); + const yijian = common_vendor.ref(""); + const tel = common_vendor.ref(""); + const btnSumit = () => { + let phoneNumberPattern = /^(?:(?:\+|00)86)?1[3-9]\d{9}$/; + if (tel.value.match(phoneNumberPattern)) { + api_api.getAdd({ phoneNumber: tel.value, recommendation: yijian.value }).then((res) => { + console.log(res); + if (res.code === 200) { + common_vendor.index.showToast({ + icon: "none", + title: "提交成功", + duration: 1e3 + }); + } + }); + } else { + common_vendor.index.showToast({ + icon: "none", + title: "请输入正确的手机号码", + duration: 1e3 + }); + } + }; return (_ctx, _cache) => { return { a: common_vendor.p({ titles: titles.value, bgcolor: bgcolor.value, color: color.value - }) + }), + b: yijian.value, + c: common_vendor.o(($event) => yijian.value = $event.detail.value), + d: tel.value, + e: common_vendor.o(($event) => tel.value = $event.detail.value), + f: common_vendor.o(btnSumit) }; }; } diff --git a/unpackage/dist/dev/mp-weixin/pages/yijian/yijian.wxml b/unpackage/dist/dev/mp-weixin/pages/yijian/yijian.wxml index d2d8f5d..0525e9e 100644 --- a/unpackage/dist/dev/mp-weixin/pages/yijian/yijian.wxml +++ b/unpackage/dist/dev/mp-weixin/pages/yijian/yijian.wxml @@ -1 +1 @@ - \ No newline at end of file + 提交 \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/yijian/yijian.wxss b/unpackage/dist/dev/mp-weixin/pages/yijian/yijian.wxss index 52278d7..a31e780 100644 --- a/unpackage/dist/dev/mp-weixin/pages/yijian/yijian.wxss +++ b/unpackage/dist/dev/mp-weixin/pages/yijian/yijian.wxss @@ -87,4 +87,18 @@ box-sizing: border-box; padding-left: 30rpx; font-size: 30rpx; +} +.yijian .btnSumit { + width: 80%; + height: 100rpx; + background: linear-gradient(276deg, #1C9FF7 0%, #1275F7 100%); + box-shadow: 0rpx 8rpx 18rpx 0rpx rgba(5, 128, 255, 0.2); + border-radius: 30rpx; + text-align: center; + line-height: 100rpx; + font-size: 30rpx; + color: white; + margin-top: 260rpx; + transform: translateX(-50%); + margin-left: 50%; } \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/stor/index.js b/unpackage/dist/dev/mp-weixin/stor/index.js index 74adb57..0e277a2 100644 --- a/unpackage/dist/dev/mp-weixin/stor/index.js +++ b/unpackage/dist/dev/mp-weixin/stor/index.js @@ -54,6 +54,13 @@ const storindex = common_vendor.defineStore("storindex", () => { p.value = 0; } else { console.log("out_trade_no", res); + const qaq = await api_api.getTincheCoupons({ + phoneNumber: common_vendor.index.getStorageSync("phoneNumber") + }); + common_vendor.index.showToast({ + icon: "none", + title: `${qaq.data[0]}` + }); const res1 = await api_api.getWxPlay({ appId: common_baseurl.appid, phone: common_vendor.index.getStorageSync("phoneNumber"), @@ -307,6 +314,13 @@ const storindex = common_vendor.defineStore("storindex", () => { }); p.value = 0; } else { + const qaq = await api_api.getTincheCoupons({ + phoneNumber: common_vendor.index.getStorageSync("phoneNumber") + }); + common_vendor.index.showToast({ + icon: "none", + title: `${qaq.data[0]}` + }); const res4 = await api_api.start({ mid: common_vendor.index.getStorageSync("mid"), price: 100, @@ -371,6 +385,13 @@ const storindex = common_vendor.defineStore("storindex", () => { }); p.value = 0; } else { + const qaq = await api_api.getTincheCoupons({ + phoneNumber: common_vendor.index.getStorageSync("phoneNumber") + }); + common_vendor.index.showToast({ + icon: "none", + title: `${qaq.data[0]}` + }); const res4 = await api_api.start({ mid: common_vendor.index.getStorageSync("mid"), price: 100, diff --git a/unpackage/dist/dev/mp-weixin/utils/interceptor.js b/unpackage/dist/dev/mp-weixin/utils/interceptor.js new file mode 100644 index 0000000..1c25151 --- /dev/null +++ b/unpackage/dist/dev/mp-weixin/utils/interceptor.js @@ -0,0 +1,27 @@ +"use strict"; +const common_vendor = require("../common/vendor.js"); +let needLogin = ["/pages/index/index", "/pages/handle/handle", "/pages/login/login", "/pages/sweep/sweep", "/pages/networkDetail/networkDetail"]; +let list = ["navigateTo", "redirectTo", "reLaunch", "switchTab"]; +list.forEach((item) => { + console.log(item, "router list item"); + common_vendor.index.addInterceptor(item, { + invoke(e) { + const token = common_vendor.index.getStorageSync("phoneNumber"); + const url = e.url.split("?")[0]; + if (!needLogin.includes(url) && !token) { + common_vendor.index.navigateTo({ + url: "/pages/login/login", + success: (res) => { + }, + fail: (res) => { + } + }); + return false; + } + return true; + }, + fail(err) { + console.log(err); + } + }); +}); diff --git a/utils/interceptor.js b/utils/interceptor.js index eb1c382..7a9ed3c 100644 --- a/utils/interceptor.js +++ b/utils/interceptor.js @@ -1,4 +1,4 @@ -let needLogin = ['/pages/home/home','/pages/list/list','/pages/my/my','/pages/login/login','/pages/recharge/recharge','/pages/storeDetails/storeDetails'] +let needLogin = ['/pages/index/index','/pages/handle/handle','/pages/login/login','/pages/sweep/sweep','/pages/networkDetail/networkDetail'] let list = ["navigateTo", "redirectTo", "reLaunch", "switchTab"]; list.forEach(item => { //用遍历的方式分别为,uni.navigateTo,uni.redirectTo,uni.reLaunch,uni.switchTab这4个路由方法添加拦截器