From 10533eb67d1bc2027a182af5e9caed3b155690d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Wed, 14 Aug 2024 06:39:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E6=A1=86=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 2 + .env.development | 9 + .env.production | 8 + src/App.vue | 35 +- src/api/cms/website/model/index.ts | 2 - src/api/passport/login/index.ts | 11 +- src/api/system/user/model/index.ts | 4 + src/api/think/sysLog/index.ts | 106 +++ src/api/think/sysLog/model/index.ts | 23 + src/api/think/thinkAdmin/index.ts | 106 +++ src/api/think/thinkAdmin/model/index.ts | 45 ++ src/api/think/thinkAdminLog/index.ts | 106 +++ src/api/think/thinkAdminLog/model/index.ts | 27 + src/api/think/thinkAuthGroup/index.ts | 106 +++ src/api/think/thinkAuthGroup/model/index.ts | 27 + src/api/think/thinkAuthGroupAccess/index.ts | 112 +++ .../think/thinkAuthGroupAccess/model/index.ts | 19 + src/api/think/thinkAuthRule/index.ts | 106 +++ src/api/think/thinkAuthRule/model/index.ts | 37 + src/api/think/thinkBankCard/index.ts | 106 +++ src/api/think/thinkBankCard/model/index.ts | 27 + src/api/think/thinkCard/index.ts | 121 +++ src/api/think/thinkCard/model/index.ts | 96 +++ src/api/think/thinkCardBindLog/index.ts | 108 +++ src/api/think/thinkCardBindLog/model/index.ts | 23 + src/api/think/thinkCardDelLog/index.ts | 106 +++ src/api/think/thinkCardDelLog/model/index.ts | 25 + src/api/think/thinkCardEditLog/index.ts | 106 +++ src/api/think/thinkCardEditLog/model/index.ts | 27 + src/api/think/thinkCardLog/index.ts | 106 +++ src/api/think/thinkCardLog/model/index.ts | 31 + src/api/think/thinkCardUserLog/index.ts | 108 +++ src/api/think/thinkCardUserLog/model/index.ts | 31 + src/api/think/thinkCarousel/index.ts | 106 +++ src/api/think/thinkCarousel/model/index.ts | 35 + src/api/think/thinkCoach/index.ts | 106 +++ src/api/think/thinkCoach/model/index.ts | 39 + src/api/think/thinkCoachCash/index.ts | 106 +++ src/api/think/thinkCoachCash/model/index.ts | 33 + src/api/think/thinkCoachCur/index.ts | 106 +++ src/api/think/thinkCoachCur/model/index.ts | 29 + src/api/think/thinkCoachImgs/index.ts | 106 +++ src/api/think/thinkCoachImgs/model/index.ts | 21 + src/api/think/thinkCoachOrder/index.ts | 106 +++ src/api/think/thinkCoachOrder/model/index.ts | 33 + src/api/think/thinkCoachTime/index.ts | 106 +++ src/api/think/thinkCoachTime/model/index.ts | 21 + src/api/think/thinkConfig/index.ts | 106 +++ src/api/think/thinkConfig/model/index.ts | 21 + src/api/think/thinkCoupon/index.ts | 106 +++ src/api/think/thinkCoupon/model/index.ts | 51 ++ src/api/think/thinkDeposit/index.ts | 106 +++ src/api/think/thinkDeposit/model/index.ts | 39 + src/api/think/thinkField/index.ts | 106 +++ src/api/think/thinkField/model/index.ts | 41 + src/api/think/thinkGate/index.ts | 106 +++ src/api/think/thinkGate/model/index.ts | 43 + src/api/think/thinkGatePassreord/index.ts | 106 +++ .../think/thinkGatePassreord/model/index.ts | 46 ++ src/api/think/thinkGoods/index.ts | 106 +++ src/api/think/thinkGoods/model/index.ts | 57 ++ src/api/think/thinkGoodsCategory/index.ts | 106 +++ .../think/thinkGoodsCategory/model/index.ts | 29 + src/api/think/thinkGoodsImage/index.ts | 106 +++ src/api/think/thinkGoodsImage/model/index.ts | 21 + src/api/think/thinkGoodsOrder/index.ts | 106 +++ src/api/think/thinkGoodsOrder/model/index.ts | 51 ++ src/api/think/thinkGoodsOrderInfo/index.ts | 106 +++ .../think/thinkGoodsOrderInfo/model/index.ts | 35 + src/api/think/thinkGoodsSku/index.ts | 106 +++ src/api/think/thinkGoodsSku/model/index.ts | 37 + src/api/think/thinkGoodsSpecRel/index.ts | 106 +++ .../think/thinkGoodsSpecRel/model/index.ts | 25 + src/api/think/thinkIntegral/index.ts | 122 +++ src/api/think/thinkIntegral/model/index.ts | 31 + src/api/think/thinkIntegralLog/index.ts | 108 +++ src/api/think/thinkIntegralLog/model/index.ts | 37 + src/api/think/thinkInvoice/index.ts | 106 +++ src/api/think/thinkInvoice/model/index.ts | 62 ++ src/api/think/thinkInvoiceConfig/index.ts | 108 +++ .../think/thinkInvoiceConfig/model/index.ts | 21 + src/api/think/thinkInvoiceRequestLog/index.ts | 117 +++ .../thinkInvoiceRequestLog/model/index.ts | 25 + src/api/think/thinkLog/index.ts | 106 +++ src/api/think/thinkLog/model/index.ts | 37 + src/api/think/thinkMessage/index.ts | 106 +++ src/api/think/thinkMessage/model/index.ts | 39 + src/api/think/thinkMoneyLog/index.ts | 106 +++ src/api/think/thinkMoneyLog/model/index.ts | 39 + src/api/think/thinkNews/index.ts | 106 +++ src/api/think/thinkNews/model/index.ts | 41 + src/api/think/thinkNewsCategory/index.ts | 108 +++ .../think/thinkNewsCategory/model/index.ts | 29 + src/api/think/thinkOldCard/index.ts | 106 +++ src/api/think/thinkOldCard/model/index.ts | 39 + src/api/think/thinkOrder/index.ts | 106 +++ src/api/think/thinkOrder/model/index.ts | 95 +++ src/api/think/thinkOrderInfo/index.ts | 106 +++ src/api/think/thinkOrderInfo/model/index.ts | 53 ++ src/api/think/thinkOrderInfoLog/index.ts | 108 +++ .../think/thinkOrderInfoLog/model/index.ts | 27 + src/api/think/thinkOrderLog/index.ts | 106 +++ src/api/think/thinkOrderLog/model/index.ts | 37 + src/api/think/thinkOrderRefundLog/index.ts | 112 +++ .../think/thinkOrderRefundLog/model/index.ts | 31 + src/api/think/thinkPayLog/index.ts | 106 +++ src/api/think/thinkPayLog/model/index.ts | 25 + src/api/think/thinkQrcode/index.ts | 106 +++ src/api/think/thinkQrcode/model/index.ts | 49 ++ src/api/think/thinkRechargeLog/index.ts | 108 +++ src/api/think/thinkRechargeLog/model/index.ts | 35 + src/api/think/thinkSignup/index.ts | 106 +++ src/api/think/thinkSignup/model/index.ts | 47 ++ src/api/think/thinkSignupCategory/index.ts | 112 +++ .../think/thinkSignupCategory/model/index.ts | 29 + src/api/think/thinkSignupLists/index.ts | 108 +++ src/api/think/thinkSignupLists/model/index.ts | 37 + src/api/think/thinkSite/index.ts | 106 +++ src/api/think/thinkSite/model/index.ts | 50 ++ src/api/think/thinkSiteImgs/index.ts | 106 +++ src/api/think/thinkSiteImgs/model/index.ts | 21 + src/api/think/thinkSiteTime/index.ts | 106 +++ src/api/think/thinkSiteTime/model/index.ts | 47 ++ src/api/think/thinkSpec/index.ts | 106 +++ src/api/think/thinkSpec/model/index.ts | 21 + src/api/think/thinkSpecValue/index.ts | 106 +++ src/api/think/thinkSpecValue/model/index.ts | 23 + src/api/think/thinkUserBind/index.ts | 106 +++ src/api/think/thinkUserBind/model/index.ts | 27 + src/api/think/thinkUsers/index.ts | 115 +++ src/api/think/thinkUsers/model/index.ts | 48 ++ src/api/think/thinkUsersAddress/index.ts | 108 +++ .../think/thinkUsersAddress/model/index.ts | 33 + src/api/think/thinkUsersCoupon/index.ts | 108 +++ src/api/think/thinkUsersCoupon/model/index.ts | 53 ++ src/api/think/thinkUsersEmergency/index.ts | 112 +++ .../think/thinkUsersEmergency/model/index.ts | 33 + src/api/think/thinkUsersLog/index.ts | 106 +++ src/api/think/thinkUsersLog/model/index.ts | 29 + src/api/think/thinkUsersVip/index.ts | 106 +++ src/api/think/thinkUsersVip/model/index.ts | 85 ++ src/api/think/thinkUsersVipCancleLog/index.ts | 117 +++ .../thinkUsersVipCancleLog/model/index.ts | 31 + src/api/think/thinkVip/index.ts | 106 +++ src/api/think/thinkVip/model/index.ts | 59 ++ src/api/think/thinkWechatBill/index.ts | 106 +++ src/api/think/thinkWechatBill/model/index.ts | 35 + src/api/think/thinkWechatBillLog/index.ts | 108 +++ .../think/thinkWechatBillLog/model/index.ts | 29 + src/api/think/thinkWechatDeposit/index.ts | 108 +++ .../think/thinkWechatDeposit/model/index.ts | 41 + src/api/user/model/index.ts | 2 + src/config/setting.ts | 17 +- src/package/order/detail.vue | 92 ++- src/package/user/address.vue | 741 +++++++++--------- src/package/user/emergency.vue | 28 +- src/package/user/ic-card.vue | 378 ++++----- src/package/user/integral.vue | 31 +- src/package/user/personal.vue | 34 +- src/pages/index.vue | 4 +- src/pages/order.vue | 69 +- src/pages/user.vue | 181 +++-- .../ws-login/components/ws-login/ws-login.vue | 13 + .../components/ws-my-asset/ws-my-asset.vue | 4 +- .../components/ws-user-card/ws-user-card.vue | 80 +- src/utils/request.ts | 82 +- 166 files changed, 11388 insertions(+), 856 deletions(-) create mode 100644 .env create mode 100644 .env.development create mode 100644 .env.production create mode 100644 src/api/think/sysLog/index.ts create mode 100644 src/api/think/sysLog/model/index.ts create mode 100644 src/api/think/thinkAdmin/index.ts create mode 100644 src/api/think/thinkAdmin/model/index.ts create mode 100644 src/api/think/thinkAdminLog/index.ts create mode 100644 src/api/think/thinkAdminLog/model/index.ts create mode 100644 src/api/think/thinkAuthGroup/index.ts create mode 100644 src/api/think/thinkAuthGroup/model/index.ts create mode 100644 src/api/think/thinkAuthGroupAccess/index.ts create mode 100644 src/api/think/thinkAuthGroupAccess/model/index.ts create mode 100644 src/api/think/thinkAuthRule/index.ts create mode 100644 src/api/think/thinkAuthRule/model/index.ts create mode 100644 src/api/think/thinkBankCard/index.ts create mode 100644 src/api/think/thinkBankCard/model/index.ts create mode 100644 src/api/think/thinkCard/index.ts create mode 100644 src/api/think/thinkCard/model/index.ts create mode 100644 src/api/think/thinkCardBindLog/index.ts create mode 100644 src/api/think/thinkCardBindLog/model/index.ts create mode 100644 src/api/think/thinkCardDelLog/index.ts create mode 100644 src/api/think/thinkCardDelLog/model/index.ts create mode 100644 src/api/think/thinkCardEditLog/index.ts create mode 100644 src/api/think/thinkCardEditLog/model/index.ts create mode 100644 src/api/think/thinkCardLog/index.ts create mode 100644 src/api/think/thinkCardLog/model/index.ts create mode 100644 src/api/think/thinkCardUserLog/index.ts create mode 100644 src/api/think/thinkCardUserLog/model/index.ts create mode 100644 src/api/think/thinkCarousel/index.ts create mode 100644 src/api/think/thinkCarousel/model/index.ts create mode 100644 src/api/think/thinkCoach/index.ts create mode 100644 src/api/think/thinkCoach/model/index.ts create mode 100644 src/api/think/thinkCoachCash/index.ts create mode 100644 src/api/think/thinkCoachCash/model/index.ts create mode 100644 src/api/think/thinkCoachCur/index.ts create mode 100644 src/api/think/thinkCoachCur/model/index.ts create mode 100644 src/api/think/thinkCoachImgs/index.ts create mode 100644 src/api/think/thinkCoachImgs/model/index.ts create mode 100644 src/api/think/thinkCoachOrder/index.ts create mode 100644 src/api/think/thinkCoachOrder/model/index.ts create mode 100644 src/api/think/thinkCoachTime/index.ts create mode 100644 src/api/think/thinkCoachTime/model/index.ts create mode 100644 src/api/think/thinkConfig/index.ts create mode 100644 src/api/think/thinkConfig/model/index.ts create mode 100644 src/api/think/thinkCoupon/index.ts create mode 100644 src/api/think/thinkCoupon/model/index.ts create mode 100644 src/api/think/thinkDeposit/index.ts create mode 100644 src/api/think/thinkDeposit/model/index.ts create mode 100644 src/api/think/thinkField/index.ts create mode 100644 src/api/think/thinkField/model/index.ts create mode 100644 src/api/think/thinkGate/index.ts create mode 100644 src/api/think/thinkGate/model/index.ts create mode 100644 src/api/think/thinkGatePassreord/index.ts create mode 100644 src/api/think/thinkGatePassreord/model/index.ts create mode 100644 src/api/think/thinkGoods/index.ts create mode 100644 src/api/think/thinkGoods/model/index.ts create mode 100644 src/api/think/thinkGoodsCategory/index.ts create mode 100644 src/api/think/thinkGoodsCategory/model/index.ts create mode 100644 src/api/think/thinkGoodsImage/index.ts create mode 100644 src/api/think/thinkGoodsImage/model/index.ts create mode 100644 src/api/think/thinkGoodsOrder/index.ts create mode 100644 src/api/think/thinkGoodsOrder/model/index.ts create mode 100644 src/api/think/thinkGoodsOrderInfo/index.ts create mode 100644 src/api/think/thinkGoodsOrderInfo/model/index.ts create mode 100644 src/api/think/thinkGoodsSku/index.ts create mode 100644 src/api/think/thinkGoodsSku/model/index.ts create mode 100644 src/api/think/thinkGoodsSpecRel/index.ts create mode 100644 src/api/think/thinkGoodsSpecRel/model/index.ts create mode 100644 src/api/think/thinkIntegral/index.ts create mode 100644 src/api/think/thinkIntegral/model/index.ts create mode 100644 src/api/think/thinkIntegralLog/index.ts create mode 100644 src/api/think/thinkIntegralLog/model/index.ts create mode 100644 src/api/think/thinkInvoice/index.ts create mode 100644 src/api/think/thinkInvoice/model/index.ts create mode 100644 src/api/think/thinkInvoiceConfig/index.ts create mode 100644 src/api/think/thinkInvoiceConfig/model/index.ts create mode 100644 src/api/think/thinkInvoiceRequestLog/index.ts create mode 100644 src/api/think/thinkInvoiceRequestLog/model/index.ts create mode 100644 src/api/think/thinkLog/index.ts create mode 100644 src/api/think/thinkLog/model/index.ts create mode 100644 src/api/think/thinkMessage/index.ts create mode 100644 src/api/think/thinkMessage/model/index.ts create mode 100644 src/api/think/thinkMoneyLog/index.ts create mode 100644 src/api/think/thinkMoneyLog/model/index.ts create mode 100644 src/api/think/thinkNews/index.ts create mode 100644 src/api/think/thinkNews/model/index.ts create mode 100644 src/api/think/thinkNewsCategory/index.ts create mode 100644 src/api/think/thinkNewsCategory/model/index.ts create mode 100644 src/api/think/thinkOldCard/index.ts create mode 100644 src/api/think/thinkOldCard/model/index.ts create mode 100644 src/api/think/thinkOrder/index.ts create mode 100644 src/api/think/thinkOrder/model/index.ts create mode 100644 src/api/think/thinkOrderInfo/index.ts create mode 100644 src/api/think/thinkOrderInfo/model/index.ts create mode 100644 src/api/think/thinkOrderInfoLog/index.ts create mode 100644 src/api/think/thinkOrderInfoLog/model/index.ts create mode 100644 src/api/think/thinkOrderLog/index.ts create mode 100644 src/api/think/thinkOrderLog/model/index.ts create mode 100644 src/api/think/thinkOrderRefundLog/index.ts create mode 100644 src/api/think/thinkOrderRefundLog/model/index.ts create mode 100644 src/api/think/thinkPayLog/index.ts create mode 100644 src/api/think/thinkPayLog/model/index.ts create mode 100644 src/api/think/thinkQrcode/index.ts create mode 100644 src/api/think/thinkQrcode/model/index.ts create mode 100644 src/api/think/thinkRechargeLog/index.ts create mode 100644 src/api/think/thinkRechargeLog/model/index.ts create mode 100644 src/api/think/thinkSignup/index.ts create mode 100644 src/api/think/thinkSignup/model/index.ts create mode 100644 src/api/think/thinkSignupCategory/index.ts create mode 100644 src/api/think/thinkSignupCategory/model/index.ts create mode 100644 src/api/think/thinkSignupLists/index.ts create mode 100644 src/api/think/thinkSignupLists/model/index.ts create mode 100644 src/api/think/thinkSite/index.ts create mode 100644 src/api/think/thinkSite/model/index.ts create mode 100644 src/api/think/thinkSiteImgs/index.ts create mode 100644 src/api/think/thinkSiteImgs/model/index.ts create mode 100644 src/api/think/thinkSiteTime/index.ts create mode 100644 src/api/think/thinkSiteTime/model/index.ts create mode 100644 src/api/think/thinkSpec/index.ts create mode 100644 src/api/think/thinkSpec/model/index.ts create mode 100644 src/api/think/thinkSpecValue/index.ts create mode 100644 src/api/think/thinkSpecValue/model/index.ts create mode 100644 src/api/think/thinkUserBind/index.ts create mode 100644 src/api/think/thinkUserBind/model/index.ts create mode 100644 src/api/think/thinkUsers/index.ts create mode 100644 src/api/think/thinkUsers/model/index.ts create mode 100644 src/api/think/thinkUsersAddress/index.ts create mode 100644 src/api/think/thinkUsersAddress/model/index.ts create mode 100644 src/api/think/thinkUsersCoupon/index.ts create mode 100644 src/api/think/thinkUsersCoupon/model/index.ts create mode 100644 src/api/think/thinkUsersEmergency/index.ts create mode 100644 src/api/think/thinkUsersEmergency/model/index.ts create mode 100644 src/api/think/thinkUsersLog/index.ts create mode 100644 src/api/think/thinkUsersLog/model/index.ts create mode 100644 src/api/think/thinkUsersVip/index.ts create mode 100644 src/api/think/thinkUsersVip/model/index.ts create mode 100644 src/api/think/thinkUsersVipCancleLog/index.ts create mode 100644 src/api/think/thinkUsersVipCancleLog/model/index.ts create mode 100644 src/api/think/thinkVip/index.ts create mode 100644 src/api/think/thinkVip/model/index.ts create mode 100644 src/api/think/thinkWechatBill/index.ts create mode 100644 src/api/think/thinkWechatBill/model/index.ts create mode 100644 src/api/think/thinkWechatBillLog/index.ts create mode 100644 src/api/think/thinkWechatBillLog/model/index.ts create mode 100644 src/api/think/thinkWechatDeposit/index.ts create mode 100644 src/api/think/thinkWechatDeposit/model/index.ts diff --git a/.env b/.env new file mode 100644 index 0000000..6dc5b52 --- /dev/null +++ b/.env @@ -0,0 +1,2 @@ +VITE_APP_NAME=webSoft +VITE_API_URL=/api diff --git a/.env.development b/.env.development new file mode 100644 index 0000000..f164563 --- /dev/null +++ b/.env.development @@ -0,0 +1,9 @@ +VITE_APP_NAME=后台管理系统 +VITE_SOCKET_URL=wss://server.gxwebsoft.com +VITE_SERVER_URL=https://server.gxwebsoft.com/api +#VITE_THINK_URL=https://gxtyzx-api.websoft.top/api +VITE_API_URL=https://modules.gxwebsoft.com/api + +#VITE_SERVER_URL=http://127.0.0.1:9090/api +#VITE_API_URL=http://127.0.0.1:9001/api +VITE_THINK_URL=http://127.0.0.1:9099/api diff --git a/.env.production b/.env.production new file mode 100644 index 0000000..ee66a2b --- /dev/null +++ b/.env.production @@ -0,0 +1,8 @@ +VITE_APP_NAME=后台管理系统 +VITE_SOCKET_URL=wss://server.gxwebsoft.com +VITE_SERVER_URL=https://server.gxwebsoft.com/api +VITE_THINK_URL=https://gxtyzx-api.websoft.top/api +VITE_API_URL=https://modules.gxwebsoft.com/api +#VITE_SERVER_URL=http://127.0.0.1:9090/api +#VITE_API_URL=http://127.0.0.1:9001/api +#VITE_THINK_URL=http://127.0.0.1:9099/api diff --git a/src/App.vue b/src/App.vue index 8d7681a..1882325 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,7 +1,14 @@ \ No newline at end of file + .web-text-secondary { + margin-right: 20rpx; + } +} + diff --git a/src/package/user/emergency.vue b/src/package/user/emergency.vue index db6b368..07e4cf1 100644 --- a/src/package/user/emergency.vue +++ b/src/package/user/emergency.vue @@ -6,7 +6,7 @@ - + @@ -30,11 +30,11 @@ - - + + - - + + import { useUserStore } from '@/store/modules/user'; -import * as Api from '@/api/booking/emergency'; +import * as Api from '@/api/think/thinkUsersEmergency'; import * as MpMenuApi from '@/api/cms/mp-menu/index'; import { getWxOpenId } from '@/api/passport/login'; import { openUrl } from '@/utils/common'; @@ -68,12 +68,12 @@ export default { statusBarHeight: 104, isLogin: false, form: { - name: '', - phone: '' + contractName: '', + contractPhone: '' }, rules: { // 对name字段进行必填验证 - name: { + contractName: { rules: [ { required: true, @@ -87,7 +87,7 @@ export default { ] }, // 对email字段进行必填验证 - phone: { + contractPhone: { rules: [ { required: true, @@ -119,8 +119,8 @@ export default { } // 获取联系人列表 - Api.pageEmergency({ - userId: userInfo.userId + Api.pageThinkUsersEmergency({ + uid: uni.getStorageSync('uid') }).then((res) => { app.list = res.list; }); @@ -151,7 +151,7 @@ export default { uni.showLoading({ title: '请求中.' }); - Api.removeEmergency(item.emergencyId).then((res) => { + Api.removeThinkUsersEmergency(item.id).then((res) => { uni.showToast({ title: '操作成功', icon: 'none' @@ -167,7 +167,7 @@ export default { this.$refs.form .validate() .then((res) => { - Api.addEmergency(this.form) + Api.addThinkUsersEmergency({...this.form,sort: 99}) .then((msg) => { uni.showToast({ title: msg, diff --git a/src/package/user/ic-card.vue b/src/package/user/ic-card.vue index 3d16842..f204141 100644 --- a/src/package/user/ic-card.vue +++ b/src/package/user/ic-card.vue @@ -1,224 +1,228 @@ diff --git a/src/package/user/integral.vue b/src/package/user/integral.vue index 1799367..359e2e9 100644 --- a/src/package/user/integral.vue +++ b/src/package/user/integral.vue @@ -6,7 +6,7 @@ 当前积分 - {{ Math.floor(userInfo.users.integral) }} + {{ Math.floor(users.integral) }} - - + + - + @@ -67,7 +67,7 @@ import { useUserStore } from '@/store/modules/user'; - import * as UserApi from '@/api/booking/users'; + import * as UserApi from '@/api/think/thinkUsers'; import * as MpMenuApi from '@/api/cms/mp-menu/index'; import { getWxOpenId @@ -110,9 +110,7 @@ app.isLogin = true app.form = userInfo // 获取用户副表信息 - UserApi.getByPhone({ - phone: userInfo.phone - }).then(data => { + UserApi.getThinkUsers(uni.getStorageSync('uid')).then(data => { if (data) { app.form = Object.assign({}, app.form, data); } @@ -145,16 +143,16 @@ async chooseAvatar({detail}) { const url = detail.avatarUrl this.form.avatarUrl = await uploadOssByPath(url) - UserApi.updateUsers({ - id: this.form.id, - avatarUrl: `${this.form.avatarUrl}` - }) + await UserApi.updateThinkUsers({ + id: this.form.id, + avatarUrl: `${this.form.avatarUrl}` + }) }, save() { const app = this const { form } = this - if(!uni.$uv.test.idCard(form.idCard)){ + if(!uni.$uv.test.idCard(form.idcard)){ uni.showToast({ title: '请填写真实身份证号', icon: 'none' @@ -162,13 +160,7 @@ return false } - UserApi.updateUsers({ - phone: form.phone, - username: form.username, - realName: form.realName, - idCard: form.idCard, - id: form.id - }).then(res => { + UserApi.updateThinkUsers(this.form).then(res => { uni.showToast({ title: '保存成功', icon: 'success' diff --git a/src/pages/index.vue b/src/pages/index.vue index 7b9bf99..8251346 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -157,11 +157,13 @@ export default { name: 'star', title: '元芳' } - ] + ], + openid: null }; }, onLoad() { this.reload(); + this.openid = uni.getStorageSync('openid'); }, methods: { async reload() { diff --git a/src/pages/order.vue b/src/pages/order.vue index fd59e11..53ed966 100644 --- a/src/pages/order.vue +++ b/src/pages/order.vue @@ -14,17 +14,17 @@ - {{ item.merchantName }} + {{ item.siteName }} - + 已取消 - + 已完成 - 已支付 - + 已支付 + 未支付 @@ -34,10 +34,10 @@ - - + + @click="openUrl(`/package/order/detail?id=${item.id}`)"/> @@ -49,9 +49,9 @@ - +