From 23f1ff37d45a6fc27eb5e2fec2e2e1d7990afba3 Mon Sep 17 00:00:00 2001 From: xy <271556543@qq.com> Date: Thu, 16 Jan 2025 17:58:53 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/http.api.js | 63 +- common/http.interceptor.js | 2 - package_sub/pages/AddOrder/AddOrder.vue | 2544 +++++++++-------- .../pages/ServiceDetail/ServiceDetail.vue | 30 +- package_sub/pages/ServiceList/ServiceList.vue | 39 +- pages/index/index.vue | 217 +- pages/login/login.vue | 9 +- pages/me/me.vue | 40 +- pages/order/order.vue | 238 +- static/logo-mini.png | Bin 0 -> 2986 bytes store/index.js | 1 + 11 files changed, 1756 insertions(+), 1427 deletions(-) create mode 100644 static/logo-mini.png diff --git a/common/http.api.js b/common/http.api.js index a1bd4de..d2da6f8 100644 --- a/common/http.api.js +++ b/common/http.api.js @@ -1,4 +1,3 @@ - //api集合 let apiApp = { // 用户 @@ -8,7 +7,7 @@ let apiApp = { getMobile: '/api/mobile/user/mobile', // 用户订单 accompanyOrders: '/api/mobile/user/accompany-orders', - accompanyOrdersDetail: '/api​/mobile​/user​/accompany-orders-detail', + accompanyOrdersDetail: '/api/mobile/user/accompany-orders-detail', // 医院 陪护下单 listHospital: '/api/mobile/hospital/hospital', detailHospital: '/api/mobile/hospital/hospital-detail', @@ -39,12 +38,14 @@ let apiApp = { userAddressShow: '/api/mobile/user-address/show', userAddressSave: '/api/mobile/user-address/save', userAddressDestroy: '/api/mobile/user-address/destroy', - // 用户商城订单 - userOrders: '/api/mobile/user/orders', + // 用户商城订单 + userOrders: '/api/mobile/user/orders', userOrdersDetail: '/api/mobile/user/orders-detail', + hospital: '/api/mobile/hospital/hospital', + banner: '/api/mobile/other/banner', } // 此处第二个参数vm，就是我们在页面使用的this，你可以通过vm获取vuex等操作 @@ -83,41 +84,47 @@ const install = (Vue, vm) => { const productList = (params = {}) => vm.$u.get(apiApp.productList, params) const productDetail = (params = {}) => vm.$u.get(apiApp.productDetail, params) const productOrder = (params = {}) => vm.$u.get(apiApp.productOrder, params) - const productPay = (params = {}) => vm.$u.get(apiApp.productPay, params) - // 收货地址 - const userAddress = (params = {}) => vm.$u.get(apiApp.userAddress, params) - const userAddressShow = (params = {}) => vm.$u.get(apiApp.userAddressShow, params) - const userAddressSave = (params = {}) => vm.$u.post(apiApp.userAddressSave, params) - const userAddressDestroy = (params = {}) => vm.$u.get(apiApp.userAddressDestroy, params) - // 用户商城订单 - const userOrders = (params = {}) => vm.$u.get(apiApp.userOrders, params) - const userOrdersDetail = (params = {}) => vm.$u.get(apiApp.userOrdersDetail, params) + const productPay = (params = {}) => vm.$u.get(apiApp.productPay, params) + // 收货地址 + const userAddress = (params = {}) => vm.$u.get(apiApp.userAddress, params) + const userAddressShow = (params = {}) => vm.$u.get(apiApp.userAddressShow, params) + const userAddressSave = (params = {}) => vm.$u.post(apiApp.userAddressSave, params) + const userAddressDestroy = (params = {}) => vm.$u.get(apiApp.userAddressDestroy, params) + // 用户商城订单 + const userOrders = (params = {}) => vm.$u.get(apiApp.userOrders, params) + const userOrdersDetail = (params = {}) => vm.$u.get(apiApp.userOrdersDetail, params) + const hospitalList = (params = {}) => vm.$u.get(apiApp.hospital, params) + const banner = (params = {}) => vm.$u.get(apiApp.banner, params) // end - vm.$u.api = { + vm.$u.api = { + hospitalList, + banner, // 用户 - login,getUserInfo,updateUser,getMobile, - //用户订单 + login, + getUserInfo, + updateUser, + getMobile, + //用户订单 accompanyOrders,accompanyOrdersDetail, // 医院 陪护下单 listHospital,detailHospital,accompanyProduct,accompanyProductDetail,accompanyProductOrder,accompanyPay, - // 服务对象 - userArchive,userArchiveShow,userArchiveSave,userArchiveDestroy, + // 服务对象 + userArchive,userArchiveShow,userArchiveSave,userArchiveDestroy, // other - otherBanner,otherSite,otherArticleType,otherArticle,otherArticleDetail,otherUpload, - // 商城 - productCategory,productList,productDetail,productOrder,productPay, - // 收货地址 - userAddress,userAddressShow,userAddressSave,userAddressDestroy, - // 用户商城订单 - userOrders,userOrdersDetail, - + otherBanner,otherSite,otherArticleType,otherArticle,otherArticleDetail,otherUpload, + // 商城 + productCategory,productList,productDetail,productOrder,productPay, + // 收货地址 + userAddress,userAddressShow,userAddressSave,userAddressDestroy, + // 用户商城订单 + userOrders,userOrdersDetail, + }; } export default { install -} - +} diff --git a/common/http.interceptor.js b/common/http.interceptor.js index f509438..f422583 100644 --- a/common/http.interceptor.js +++ b/common/http.interceptor.js @@ -20,7 +20,6 @@ const install = (Vue, vm) => { // 请求拦截部分，如配置，每次请求前都会执行 Vue.prototype.$u.http.interceptor.request = (config) => { - console.log('config-http', config) // 引用token let token = vm.vuex_token ? vm.vuex_token : uni.getStorageSync('lifeData')?.vuex_token; if (token) { @@ -31,7 +30,6 @@ const install = (Vue, vm) => { // 响应拦截，如配置，每次请求结束都会执行本方法 Vue.prototype.$u.http.interceptor.response = (res) => { - console.log('res-http',res) if (res.statusCode === 200) { if (res.data.hasOwnProperty("errcode")) { if (res.data.errcode === 40001) { diff --git a/package_sub/pages/AddOrder/AddOrder.vue b/package_sub/pages/AddOrder/AddOrder.vue index e64d394..a92f587 100644 --- a/package_sub/pages/AddOrder/AddOrder.vue +++ b/package_sub/pages/AddOrder/AddOrder.vue @@ -1,1157 +1,1387 @@ - - - - - - \ No newline at end of file + + + + + + diff --git a/package_sub/pages/ServiceDetail/ServiceDetail.vue b/package_sub/pages/ServiceDetail/ServiceDetail.vue index ee8d4bf..650bb93 100644 --- a/package_sub/pages/ServiceDetail/ServiceDetail.vue +++ b/package_sub/pages/ServiceDetail/ServiceDetail.vue @@ -1,14 +1,14 @@ @@ -239,7 +270,7 @@ page { .order { margin: 0 25rpx; border-radius: 10rpx; - filter: drop-shadow(0 0 10rpx rgba(211,211,214,0.3)); + filter: drop-shadow(0 0 10rpx rgba(211, 211, 214, 0.3)); background-color: #ffffff; margin-top: 24rpx; @@ -261,7 +292,7 @@ page { margin-left: auto; } &::after { - content: ''; + content: ""; height: 2rpx; background: #999999; opacity: 0.302; @@ -318,7 +349,6 @@ page { & > text { display: block; - } & > text:nth-child(1) { color: #999; diff --git a/static/logo-mini.png b/static/logo-mini.png new file mode 100644 index 0000000000000000000000000000000000000000..66e12c60ae0df23a9660baf484bce2a32e0e6a99 GIT binary patch literal 2986 zcmV;b3sv-qP)TSaCntCAz3(o`dyn*+`A_aUx$iFj`|ao47u%wSC>Ob2 z;~tHAjn_3^)7Y-@qQ;x*|43pkBu&zI!{dAJX#7iKi$;~kTLYP-xXbu=(tK}(#(a&H zXw^=QuX`MCz-iK0joljgA&z%Qq5~=jl&v8**-zTQq%X?U-mnZ|F>(* z)u_-|1SH?O1JZJmq@pyTeY(bxK0g0MTe@(%#)BHGG;Y@Tc`hfDcB!!ubgM=R%rVCA zHpZ_o#+Mo6ON{Y1U9xr2wg)tt(6F2#snuh@lB&k^^ z>8Mu}v~9=x$i)4MltIsGoRMvkj;P!gc{o4Kw&OmO14R6nNGLK`qtxg+h$)|^F;(N= z0gpR~pfH+3FG=7P86;Nw_o?y~IDs#U^na{uw$lO|~t1gXj zWBo1rHKuW$50XxdgV45+^=05l^G3jv>?RAhiTu zw@O6L*4XB--wWKdB6N!6f$wQ7cR9W|)%*BPoAK0B8T4aLlNytQxE8y)z2~DWX`?7T zhJRR|Mx|2(g)X+Y+xB_MsOwAU-Ig*;QV@BpJ{iTJ5KN6GrgAwi0Y1OExBpu}B!}{^2lW3A(4HWIW zgi=HZd79L~?px)5&E#rcCCRB#Ns^~g?P3Pfb^JB?$6g363~;V?ZdjUbvH)X`#tMxK zeE6R=)MJ(@bvcj}b7=fI$w&I40rrFgNv~?$$o7ADYKtg_lRlhxoRp!Aihc#(y8^PD z{6v#OyCX~)W7pVeeL<4sDl*kQ-lk!uNDE_nz;m@@X4OW7kv!&rLDFDb9Vypv297ys z0$Pum-sO-;PErBZE9AR0zP_)q&ZDLhg6gQi{X{sq!Ou_%c$uiwf6uAz=_|=~Y9Om1 zga+;LaMG1gNwTtFFKMFUm)VZ74!K9%2-St;MkNk?BD=`GnV3eB1s$uSl9a9))n=H` z6Zo1I%7HvcD5#~kGcu*Ub zq)&13pz<-*J?&%4nIZc_B3GjoUAFqpN#vo-g{+e(cl@+`LX$K1E|Tu{qNRN#^?T-x%AHW?V~%k2yS8tKany zW1SSz372#2jY5*x>Jb`a=^AJX=eU#`Od2&_iVV952bmx=hn2lX^UqC!^sS4dkffCJ zWPn>KQLfT2BMd91Z@j}uM8%ZH@F2vLoYpXu8fB1^NXz)OC?wU8w%4Kwaa*PwSDAS| z;sL7oL1_2^H2hK3GxPdkw7HpwRZ1!`Q+cn0nnk7_nj~qBF7Wt{tm+uukK}Zyo&~E5 z9sYmNAW1ahD=x=L;$ssIer%q`ccYN>E!92KTF1o}@Ps<(_sr;L4U*Z`$9(Slc$%mw z6Q{R3j8BHBjbTapBpK_}EG3cB@SEe3uZb`EmB#P+Je9PeS@mw|rijw>(-0VnB+;0U zW|)-MZF$W3%KHVLYJ;S45o*oZGyY1=lFr=HY77wnH-cc1pk^CFaH>!}OMOP9)1+6(jj}C`9vQe_cVJD^SNqsE0g;kMY)?nh z${Zmn)32Kz0ci_eaoo~ZemDn6GG}(jQm{%vd#){?DdPWD*cV@9_2tK_p7l@Gi$bSh zZsnL`43iU6oMPmKb5zfabg^N+6Z5X_UWXv_REtA4+xkkXFcXQkYand|gj`H@pGVa% zGbg*KFPGBFIg7|>tzpW?8PCIHzd?W+O30V(iy-ZDe3rE11_FhYIBU6Jp`Dj~4JOeYZi#)N_ zAqkR}$fs5BU-uftgK98*g;lH78>K}Zy(w$a*aZHX-;1M7O%QEOWDMgNZ;?lpDVHD1 zih2B8nXLM^Cj0hbzXv>ScC8Bb4u2~?=YEyr;x+BEjwdl)^-SA%$zs%gjgRw6pZZ#r z<3Hr$N0Y*eL?>AyILYCEdr10TQpb_>$0Xw}GUFw-DA7U0Ij#umFOn=-jbprx5Z$PJ gyn~;M@;?Cv076uzxA%Dg&j0`b07*qoM6N<$g2jT^n*aa+ literal 0 HcmV?d00001 diff --git a/store/index.js b/store/index.js index 3163265..0cdefcb 100644 --- a/store/index.js +++ b/store/index.js @@ -34,6 +34,7 @@ const store = new Vuex.Store({ // 加上vuex_前缀，是防止变量名冲突，也让人一目了然 // 如果vuex_version无需保存到本地永久存储，无需lifeData.vuex_version方式 vuex_version: '1.0.0', + vuex_default_icon: '/static/logo-mini.png', vuex_token: '', vuex_user: {},