sileya-ai
/
vr-shopxo-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

细节优化

master
gongfuxiang 2021-11-30 18:57:18 +08:00
parent e28e4d4e21
commit 97cbc8aea2
14 changed files with 113 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
common/css/page.css
View File

@ -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;

4
components/popup/popup.vue
View File

@ -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%);

18
manifest.json
View File

@ -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',
}

2
pages/plugins/distribution/extraction-apply/extraction-apply.vue
View File

@ -71,7 +71,7 @@
<view v-if="(extraction_data || null) != null && (extraction_data.status || 0) == 1" class="notice-content-blue spacing-mb">
注意：编辑信息将重新审核后方可生效
</view>
<view class="submit-fixed padding-main">
<view class="bottom-fixed padding-main">
<button class="bg-main br-main cr-white round text-size" type="default" form-type="submit" hover-class="none" :disabled="form_submit_disabled_status">提交</button>
</view>
</view>

2
pages/plugins/invoice/invoice-saveinfo/invoice-saveinfo.vue
View File

@ -98,7 +98,7 @@
<view class="form-gorup-title">备注<text class="form-group-tips">选填</text></view>
<input type="text" name="user_note" placeholder-class="cr-grey" class="cr-base" placeholder="备注最多230个字符" maxlength="60" :value="data.user_note || ''">
</view>
<view class="submit-fixed padding-main">
<view class="bottom-fixed padding-main">
<button class="bg-main br-main cr-white round text-size" type="default" form-type="submit" hover-class="none" :loading="form_submit_loading" :disabled="form_submit_loading">提交</button>
</view>
</view>

2
pages/plugins/invoice/order/order.vue
View File

@ -25,7 +25,7 @@
</view>
<!-- 合并开票 -->
<button v-if="select_ids.length > 0" class="submit-fixed invoice-merge-submit bg-green cr-white round" type="default" size="mini" hover-class="none" data-type="all" @tap="invoice_event">合并开票</button>
<button v-if="select_ids.length > 0" class="bottom-fixed invoice-merge-submit bg-green cr-white round" type="default" size="mini" hover-class="none" data-type="all" @tap="invoice_event">合并开票</button>
</view>
<view v-else>
<!-- 提示信息 -->

2
pages/plugins/membershiplevelvip/buy/buy.vue
View File

@ -27,7 +27,7 @@
</view>
</view>
</block>
<view class="submit-fixed">
<view class="bottom-fixed">
<button class="bg-main br-main cr-white round text-size margin-horizontal-main margin-bottom-main" type="default" hover-class="none" @tap="submit_event" :disabled="submit_disabled_status">确认支付</button>
</view>
</view>

2
pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo.vue
View File

@ -34,7 +34,7 @@
<view class="form-gorup-title">备注<text class="form-group-tips">选填</text></view>
<input type="text" name="note" placeholder-class="cr-grey" class="cr-base" placeholder="备注最多230个字符" maxlength="60" :value="data.note || ''">
</view>
<view class="submit-fixed padding-main">
<view class="bottom-fixed padding-main">
<button class="bg-main br-main cr-white round text-size" type="default" form-type="submit" hover-class="none" :loading="form_submit_loading" :disabled="form_submit_loading">提交</button>
</view>
</view>

2
pages/plugins/wallet/cash-create/cash-create.vue
View File

@ -39,7 +39,7 @@
</view>
</view>
<view class="submit-fixed padding-main">
<view class="bottom-fixed padding-main">
<button class="bg-main br-main cr-white round text-size" type="default" form-type="submit" hover-class="none" :loading="form_submit_loading" :disabled="form_submit_loading">提交</button>
</view>
</view>

2
pages/user-address-save/user-address-save.vue
View File

@ -84,7 +84,7 @@
</view>
</view>
</view>
<view class="submit-fixed padding-main">
<view class="bottom-fixed padding-main">
<button class="bg-main br-main cr-white round text-size" type="default" form-type="submit" hover-class="none" :disabled="form_submit_disabled_status">保存</button>
</view>
</view>

94
pages/user-address/user-address.vue
View File

@ -39,7 +39,7 @@
</view>
<!-- 底部操作 -->
<view class="submit-list submit-fixed padding-main">
<view class="submit-list bottom-fixed padding-main">
<button class="bg-main br-main cr-white round text-size dis-inline-block fl" type="default" hover-class="none" @tap="address_add_event">添加新地址</button>
<button class="bg-main-pair br-main-pair cr-white round text-size dis-inline-block fr" type="default" hover-class="none" @tap="choose_system_address_event">导入系统地址</button>
</view>
@ -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');
}
},

2
pages/user-order/user-order.vue
View File

@ -68,7 +68,7 @@
<!-- 合并支付 -->
<view v-if="nav_status_index == 1 && order_select_ids.length > 0 && home_is_enable_order_bulk_pay == 1">
<button class="submit-fixed pay-merge-submit bg-green cr-white round" type="default" size="mini" hover-class="none" @tap="pay_merge_event">合并支付</button>
<button class="bottom-fixed pay-merge-submit bg-green cr-white round" type="default" size="mini" hover-class="none" @tap="pay_merge_event">合并支付</button>
</view>
<!-- 支付方式 popup -->

3
pages/user/user.css
View File

@ -34,7 +34,8 @@
*/
.nav-message {
top: 55rpx;
right: 30rpx;
right: 30rpx;
z-index: 10;
}
.nav-message .badge-icon {
top: -10px;

12
pages/user/user.vue
View File

@ -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');