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 0000000..66e12c6 Binary files /dev/null and b/static/logo-mini.png differ 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: {},