1. 删除压缩包代码
2. 替换当前hdq 分支app 的代码为 压缩包中的文件
This commit is contained in:
@@ -408,6 +408,16 @@
|
||||
if (backUrl.indexOf('/pages/users/login/index') !== -1) {
|
||||
backUrl = '/pages/index/index';
|
||||
}
|
||||
|
||||
// #ifdef APP
|
||||
uni.reLaunch({
|
||||
url: "/pages/index/index"
|
||||
});
|
||||
return
|
||||
// #endif
|
||||
|
||||
console.log(69999);
|
||||
console.log(backUrl);
|
||||
uni.reLaunch({
|
||||
url: backUrl
|
||||
});
|
||||
|
||||
@@ -949,7 +949,7 @@
|
||||
mark: that.mark,
|
||||
storeId: that.system_store.id || 0,
|
||||
shippingType: that.$util.$h.Add(that.shippingType, 1),
|
||||
payChannel: that.payChannel
|
||||
payChannel: that.payChannel||'weixinh5'
|
||||
|
||||
};
|
||||
if (data.payType == 'yue' && parseFloat(that.userInfo.nowMoney) < parseFloat(that.totalPrice))
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
<template>
|
||||
<view>
|
||||
<!-- #ifdef APP-->
|
||||
<view class='status'></view>
|
||||
<!-- #endif -->
|
||||
<form @submit="formSubmit" report-submit='true'>
|
||||
<view class='addAddress pad30'>
|
||||
<view class='list borRadius14'>
|
||||
@@ -575,4 +578,12 @@
|
||||
position: absolute;
|
||||
right:0;
|
||||
}
|
||||
|
||||
.status{
|
||||
display: flex;
|
||||
width: 750rpx;
|
||||
// background-color: #E93323;
|
||||
height: var(--status-bar-height);
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
<template>
|
||||
<view>
|
||||
<!-- #ifdef APP-->
|
||||
<view class='status_1'></view>
|
||||
<!-- #endif -->
|
||||
<view class='line'>
|
||||
<image src='../../../static/images/line.jpg' v-if="addressList.length"></image>
|
||||
</view>
|
||||
@@ -44,9 +47,16 @@
|
||||
<view class='addressBnt wxbnt' @click='getWxAddress'><text class='iconfont icon-weixin2'></text>导入微信地址</view>
|
||||
<!-- #endif -->
|
||||
<!-- #ifdef H5-->
|
||||
|
||||
<view class='addressBnt bg-color' :class="this.$wechat.isWeixin()?'':'on'" @click='addAddress'><text class='iconfont icon-tianjiadizhi'></text>添加新地址</view>
|
||||
<view v-if="this.$wechat.isWeixin()" class='addressBnt wxbnt' @click='getAddress'><text class='iconfont icon-weixin2'></text>导入微信地址</view>
|
||||
<!-- #endif -->
|
||||
|
||||
|
||||
<!-- #ifdef APP-->
|
||||
<view class='addressBnt on bg-color' @click='addAddress'><text class='iconfont icon-tianjiadizhi'></text>添加新地址</view>
|
||||
<!-- #endif -->
|
||||
|
||||
</view>
|
||||
<!-- #ifdef MP -->
|
||||
<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
|
||||
@@ -458,4 +468,10 @@
|
||||
.footer .addressBnt.wxbnt {
|
||||
background-color: #fe960f;
|
||||
}
|
||||
.status_1{
|
||||
display: flex;
|
||||
width: 750rpx;
|
||||
// background-color: #E93323;
|
||||
height: var(--status-bar-height);
|
||||
}
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user