diff --git a/java-mall-app-shop-admin/main.js b/java-mall-app-shop-admin/main.js index d35b642..783b7c0 100644 --- a/java-mall-app-shop-admin/main.js +++ b/java-mall-app-shop-admin/main.js @@ -6,6 +6,7 @@ import './uni.promisify.adaptor' import tui from './utils/httpRequest' import Socket from './utils/socket.js' import "@/static/reset.css" +import "@/styles/myui.scss" // import Utils from './utils/http' // import "@/static/font/iconfont.css" diff --git a/java-mall-app-shop-admin/pages.json b/java-mall-app-shop-admin/pages.json index 8fd03a3..769a758 100644 --- a/java-mall-app-shop-admin/pages.json +++ b/java-mall-app-shop-admin/pages.json @@ -45,7 +45,7 @@ { "path": "pages/audit/mapAddress", "style": { - "navigationBarTitleText": "选择地图地址" + "navigationBarTitleText": "填写地区信息" } }, { @@ -188,13 +188,6 @@ "fontSize":"14px", "height": "58px", "spacing":"5px", - // "midButton":{ - // "text":"视图中心", - // "height": "80px", - // "width": "60px", - // "iconPath": "/static/shituzhongxin.png", - // "iconWidth": "40px" - // }, "list": [ { "pagePath": "pages/order/order", @@ -229,17 +222,6 @@ }, "text": "视图中心" }, - // { - // "pagePath": "pages/manage/manage", - // "iconfont": { - // "text": "\ue606", - // "selectedText": "\ue606", - // "selectedColor": "#4b71ff", - // "color":"#000", - // "fontSize":"24px" - // }, - // "text": "经营" - // }, { "pagePath": "pages/my/my", "iconfont": { diff --git a/java-mall-app-shop-admin/pages/audit/mapAddress.vue b/java-mall-app-shop-admin/pages/audit/mapAddress.vue index f0e9685..770e0ac 100644 --- a/java-mall-app-shop-admin/pages/audit/mapAddress.vue +++ b/java-mall-app-shop-admin/pages/audit/mapAddress.vue @@ -2,7 +2,7 @@ - + 请单击选择下面地址单击地址确定 @@ -329,11 +332,9 @@ export default { } .form { - padding: 0 36rpx; + padding: 0 24rpx 0 30rpx; background: #fff; border-top: 1px solid #f2f2f2; - .u-form-item__body__right { - } /deep/.shop1-from-item { .u-form-item__body__right { @@ -375,15 +376,7 @@ export default { } .btn-content { - bottom: 40rpx; - width: 94%; - padding: 48rpx 24rpx; - } - - .btn-next { - border-radius: 24rpx; - background: #4b71ff; - color: #fff; + padding: 30rpx 48rpx 88rpx; } .btn-login-out { diff --git a/java-mall-app-shop-admin/pages/audit/shop2.vue b/java-mall-app-shop-admin/pages/audit/shop2.vue index 42e5b06..2892755 100644 --- a/java-mall-app-shop-admin/pages/audit/shop2.vue +++ b/java-mall-app-shop-admin/pages/audit/shop2.vue @@ -1,10 +1,6 @@