diff --git a/common/css/page.css b/common/css/page.css
index 723531ca..072df838 100644
--- a/common/css/page.css
+++ b/common/css/page.css
@@ -1,38 +1,40 @@
-/* #ifdef H5 */
-body {
- background: #333 !important;
-}
-page {
- min-height: 100%;
-}
-page,
-iframe,
-.uni-page-head,
-.uni-tabbar,
-.open-location,
-.home-top-nav-content,
-.search-content-fixed,
-.trn-nav-top,
-.goods-buy-nav,
-.popup-bottom,
-.popup-top,
-.quick-movable-container,
-.online-service-movable-container {
- max-width: 800px !important;
- margin: 0 auto !important;
-}
-.trn-nav-top,
-.goods-buy-nav,
-.nav-more-view,
-.quick-movable-container,
-.online-service-movable-container {
- left: auto !important;
-}
-iframe {
- right: 0 !important;
-}
-/* #endif */
-
+/* #ifdef H5 */
+body {
+ background: #333 !important;
+}
+page {
+ min-height: 100%;
+}
+page,
+iframe,
+.uni-page-head,
+.uni-tabbar,
+.open-location,
+.home-top-nav-content,
+.search-content-fixed,
+.trn-nav-top,
+.goods-buy-nav,
+.popup-bottom,
+.popup-top,
+.quick-movable-container,
+.online-service-movable-container,
+.bottom-fixed {
+ max-width: 800px !important;
+ margin: 0 auto !important;
+}
+.trn-nav-top,
+.goods-buy-nav,
+.nav-more-view,
+.quick-movable-container,
+.online-service-movable-container {
+ left: auto !important;
+}
+iframe,
+.bottom-fixed {
+ right: 0 !important;
+}
+/* #endif */
+
/**
* 公共样式、框架样式覆盖
*/
@@ -117,7 +119,7 @@ button:before {
}
.va-m {
vertical-align: middle;
-}
+}
.pf {
position: fixed;
}
@@ -162,7 +164,7 @@ button:before {
/**
* 底部浮动
*/
-.submit-fixed {
+.bottom-fixed {
position: fixed;
left: 0;
bottom: 0;
@@ -618,19 +620,19 @@ button[disabled].bg-gray {
* 滚动标签高度
*/
.scroll-box {
- height: 100vh;
- /* #ifdef H5 */
- height: calc(100vh - 44px);
+ height: 100vh;
+ /* #ifdef H5 */
+ height: calc(100vh - 44px);
/* #endif */
}
/**
* 存在基础导航
*/
-.scroll-box-ece-nav {
- height: calc(100vh - 80rpx);
- /* #ifdef H5 */
- height: calc(100vh - 80rpx - 44px);
+.scroll-box-ece-nav {
+ height: calc(100vh - 80rpx);
+ /* #ifdef H5 */
+ height: calc(100vh - 80rpx - 44px);
/* #endif */
}
@@ -650,7 +652,7 @@ button[disabled].bg-gray {
margin-left: 20rpx;
}
.item-operation button {
- padding: 0 35rpx;
+ padding: 0 35rpx;
height: 58rpx;
line-height: 58rpx;
display: inline-flex;
diff --git a/components/popup/popup.vue b/components/popup/popup.vue
index 2f1d74d8..4317cd02 100644
--- a/components/popup/popup.vue
+++ b/components/popup/popup.vue
@@ -35,7 +35,7 @@
.popup-content {
position: fixed;
background: #fff;
- z-index: 1001;
+ z-index: 101;
overflow: hidden;
}
.popup-mask {
@@ -47,7 +47,7 @@
background-color: rgba(0, 0, 0, 0.6);
opacity: 0;
pointer-events: none;
- z-index: 1000;
+ z-index: 100;
}
.popup-left {
transform: translateX(-100%);
diff --git a/manifest.json b/manifest.json
index 440337c6..4d58e669 100644
--- a/manifest.json
+++ b/manifest.json
@@ -106,23 +106,13 @@
"sdkConfigs" : {
"maps" : {
"qqmap" : {
- "key" : ""
+ "key" : "56SBZ-PCC3G-US2QM-IXYFE-4DE5H-GRBDK"
}
}
},
"devServer" : {
"https" : false,
- "port" : 8082,
- "proxy" : {
- "/api" : {
- "target" : "https://d1.shopxo.vip",
- "ws" : true,
- "changeOrigin" : true,
- "pathRewrite" : {
- "^/api" : ""
- }
- }
- }
+ "port" : 8082
},
"router" : {
"mode" : "history",
@@ -131,6 +121,4 @@
"title" : "ShopXO"
},
"vueVersion" : "2"
-}
-//d1.shopxo.vip',
-
+}
\ No newline at end of file
diff --git a/pages/plugins/distribution/extraction-apply/extraction-apply.vue b/pages/plugins/distribution/extraction-apply/extraction-apply.vue
index f469fcb2..dafd22f6 100644
--- a/pages/plugins/distribution/extraction-apply/extraction-apply.vue
+++ b/pages/plugins/distribution/extraction-apply/extraction-apply.vue
@@ -71,7 +71,7 @@
注意：编辑信息将重新审核后方可生效
-
+
diff --git a/pages/plugins/invoice/invoice-saveinfo/invoice-saveinfo.vue b/pages/plugins/invoice/invoice-saveinfo/invoice-saveinfo.vue
index 21589665..8a52f037 100644
--- a/pages/plugins/invoice/invoice-saveinfo/invoice-saveinfo.vue
+++ b/pages/plugins/invoice/invoice-saveinfo/invoice-saveinfo.vue
@@ -98,7 +98,7 @@
备注选填
-
+
diff --git a/pages/plugins/invoice/order/order.vue b/pages/plugins/invoice/order/order.vue
index 3eba0c53..90acd459 100644
--- a/pages/plugins/invoice/order/order.vue
+++ b/pages/plugins/invoice/order/order.vue
@@ -25,7 +25,7 @@
-
+
diff --git a/pages/plugins/membershiplevelvip/buy/buy.vue b/pages/plugins/membershiplevelvip/buy/buy.vue
index 8ea6eb03..9c9b2de5 100644
--- a/pages/plugins/membershiplevelvip/buy/buy.vue
+++ b/pages/plugins/membershiplevelvip/buy/buy.vue
@@ -27,7 +27,7 @@
-
+
diff --git a/pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo.vue b/pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo.vue
index 681b35ea..d96ae7ca 100644
--- a/pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo.vue
+++ b/pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo.vue
@@ -34,7 +34,7 @@
备注选填
-
+
diff --git a/pages/plugins/wallet/cash-create/cash-create.vue b/pages/plugins/wallet/cash-create/cash-create.vue
index 4369c4d2..96da2d0e 100644
--- a/pages/plugins/wallet/cash-create/cash-create.vue
+++ b/pages/plugins/wallet/cash-create/cash-create.vue
@@ -39,7 +39,7 @@
-
+
diff --git a/pages/user-address-save/user-address-save.vue b/pages/user-address-save/user-address-save.vue
index e3c6b3a1..2994b3a4 100644
--- a/pages/user-address-save/user-address-save.vue
+++ b/pages/user-address-save/user-address-save.vue
@@ -84,7 +84,7 @@
-
+
diff --git a/pages/user-address/user-address.vue b/pages/user-address/user-address.vue
index 0c716068..3ce572aa 100644
--- a/pages/user-address/user-address.vue
+++ b/pages/user-address/user-address.vue
@@ -39,7 +39,7 @@
-
+
@@ -300,52 +300,52 @@
},
// 获取系统地址事件
- choose_system_address_event(e) {
- console.log(e);
- if(e == 1) {
- console.log(0);
- uni.chooseAddress({
- success(res) {
- var data = {
- "name": res.userName || '',
- "tel": res.telNumber || '',
- "province": res.provinceName || '',
- "city": res.cityName || '',
- "county": res.countyName || '',
- "address": res.detailInfo || ''
- };
-
- // 加载获取数据
- uni.showLoading({
- title: "处理中..."
- });
- uni.request({
- url: app.globalData.get_request_url("outsystemadd", "useraddress"),
- method: "POST",
- data: data,
- dataType: "json",
- success: res => {
- uni.hideLoading();
- if (res.data.code == 0) {
- this.get_data_list();
- } else {
- if (app.globalData.is_login_check(res.data)) {
- app.globalData.showToast(res.data.msg);
- } else {
- app.globalData.showToast('提交失败，请重试！');
- }
- }
- },
- fail: () => {
- uni.hideLoading();
- app.globalData.showToast("服务器请求出错");
- }
- });
- }
- });
- } else {
- console.log(1);
- app.globalData.auth_check(this, 'choose_system_address_event', 'scope.address');
+ choose_system_address_event(e) {
+ console.log(e);
+ if(e == 1) {
+ console.log(0);
+ uni.chooseAddress({
+ success(res) {
+ var data = {
+ "name": res.userName || '',
+ "tel": res.telNumber || '',
+ "province": res.provinceName || '',
+ "city": res.cityName || '',
+ "county": res.countyName || '',
+ "address": res.detailInfo || ''
+ };
+
+ // 加载获取数据
+ uni.showLoading({
+ title: "处理中..."
+ });
+ uni.request({
+ url: app.globalData.get_request_url("outsystemadd", "useraddress"),
+ method: "POST",
+ data: data,
+ dataType: "json",
+ success: res => {
+ uni.hideLoading();
+ if (res.data.code == 0) {
+ this.get_data_list();
+ } else {
+ if (app.globalData.is_login_check(res.data)) {
+ app.globalData.showToast(res.data.msg);
+ } else {
+ app.globalData.showToast('提交失败，请重试！');
+ }
+ }
+ },
+ fail: () => {
+ uni.hideLoading();
+ app.globalData.showToast("服务器请求出错");
+ }
+ });
+ }
+ });
+ } else {
+ console.log(1);
+ app.globalData.auth_check(this, 'choose_system_address_event', 'scope.address');
}
},
diff --git a/pages/user-order/user-order.vue b/pages/user-order/user-order.vue
index 6f249243..cd9c842e 100644
--- a/pages/user-order/user-order.vue
+++ b/pages/user-order/user-order.vue
@@ -68,7 +68,7 @@
-
+
diff --git a/pages/user/user.css b/pages/user/user.css
index 532a040e..c5affe0b 100644
--- a/pages/user/user.css
+++ b/pages/user/user.css
@@ -34,7 +34,8 @@
*/
.nav-message {
top: 55rpx;
- right: 30rpx;
+ right: 30rpx;
+ z-index: 10;
}
.nav-message .badge-icon {
top: -10px;
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 76e52f3f..b1f5b62c 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -185,14 +185,10 @@
init_config(status) {
if ((status || false) == true) {
this.setData({
- common_app_customer_service_tel: app.globalData.get_config(
- 'config.common_app_customer_service_tel'),
- common_user_center_notice: app.globalData.get_config(
- 'config.common_user_center_notice'),
- common_app_is_online_service: app.globalData.get_config(
- 'config.common_app_is_online_service'),
- common_app_is_head_vice_nav: app.globalData.get_config(
- 'config.common_app_is_head_vice_nav')
+ common_app_customer_service_tel: app.globalData.get_config('config.common_app_customer_service_tel'),
+ common_user_center_notice: app.globalData.get_config('config.common_user_center_notice'),
+ common_app_is_online_service: app.globalData.get_config('config.common_app_is_online_service'),
+ common_app_is_head_vice_nav: app.globalData.get_config('config.common_app_is_head_vice_nav')
});
} else {
app.globalData.is_config(this, 'init_config');