yangjie
/
high-mini
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

5/10

Browse Source
master
游梦婷 2 years ago
parent c7ca758b0d
commit 8191c8c8fb
9 changed files with 171 additions and 126 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 13
      physical-merchants/address/addNewAddress/addNewAddress.vue
  2. 39
      physical-merchants/address/address.vue
  3. 62
      physical-merchants/classify/cart/cart.vue
  4. 35
      physical-merchants/classify/goods-search/goods-search.vue
  5. 39
      physical-merchants/classify/goodsDetail/goodsDetail.vue
  6. 7
      physical-merchants/classify/order/orderDetail.vue
  7. 5
      physical-merchants/classify/order/paymentResult.vue
  8. 69
      physical-merchants/classify/order/wuliuPupup/wuliuPupup.vue
  9. 4
      physical-merchants/settleAccounts/settleAccounts.vue

13
physical-merchants/address/addNewAddress/addNewAddress.vue
Unescape View File

@ -17,7 +17,7 @@
<view class="form-gorup-title">联系人<text class="form-group-tips-must">*</text>
</view>
<input type="text" name="name" v-model="userAddress.name" maxlength="5"
<input type="text" name="name" v-model="userAddress.name"
placeholder-class="corf6" class="fcor666 bs-bb" placeholder="联系人2~5个字符">
<view class="width100 mart10 border-b">
@ -114,6 +114,17 @@
onLoad(params) {
this.dataParams = params
},
watch:{
'userAddress.name':{
handler(n) {
if(n.length>5){
setTimeout(()=>{
this.userAddress.name = this.userAddress.name.substr(0,5)
},0)
}
},
},
},
computed: {
// regionName() {

39
physical-merchants/address/address.vue
Unescape View File

@ -84,27 +84,30 @@
});
this.addressList=[];
getDeliveryAddressList().then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
if (res.return_data.length > 0) {
// console.log(res.return_data)
this.addressList = res.return_data;
this.addressList.map(item => {
if (item.whetherDefault) {
this.selectId = item.id;
}
})
}
setTimeout(()=>{
} else {
uni.showToast({
title: res.return_msg,
icon: 'none',
duration: 2000
})
}
uni.hideLoading();
if (res.return_code == '000000') {
if (res.return_data.length > 0) {
// console.log(res.return_data)
this.addressList = res.return_data;
this.addressList.map(item => {
if (item.whetherDefault) {
this.selectId = item.id;
}
})
}
} else {
uni.showToast({
title: res.return_msg,
icon: 'none',
duration: 2000
})
}
},100)
})
},

62
physical-merchants/classify/cart/cart.vue
Unescape View File

@ -82,7 +82,7 @@
</label>
<!-- -->
</checkbox-group>
<view v-if="!isEdit" class="paddleft5 fcorred " @click="editDelete">编辑</view>
<view v-if="!isEdit" class="paddleft5 paddtright5 fcorred " @click="editDelete">编辑</view>
<view v-if="isEdit" class="icon-ymt delete paddleft5 fcorred font16" @click="deleteCart">删除</view>
</view>
@ -208,37 +208,37 @@
this.initData();
},
methods: {
initData(status) {
if(!status){
initData() {
uni.showLoading({
title: '加载中',
mask:true,
duration:2000
});
// console.log(20)
}
getShoppingCartList().then(res => {
if(!status){
uni.hideLoading();
}
if (res.return_code == '000000') {
this.allCheck.whetherCheck = false;
this.cartList = res.return_data;
setTimeout(()=>{
uni.hideLoading();
if (res.return_code == '000000') {
this.allCheck.whetherCheck = false;
this.cartList = res.return_data;
// 测试失效数据
// this.cartList[0].loseEfficacy=true;
// 测试失效数据
// this.cartList[0].loseEfficacy=true;
this.allCheckInit(); //全选是否勾中判断
} else {
uni.showToast({
title: res.return_msg,
icon: 'none',
duration: 2000
})
}
},100)
this.allCheckInit(); //全选是否勾中判断
} else {
uni.showToast({
title: res.return_msg,
icon: 'none',
duration: 2000
})
}
})
},
editDelete() {
@ -504,13 +504,16 @@
this.initData();
} else {
//增加数量失败
uni.showToast({
title: res.return_msg,
icon: 'none',
duration: 2000
})
setTimeout(()=>{
uni.showToast({
title: res.return_msg,
icon: 'none',
duration: 2000
})
},200)
//重新刷新数据
this.initData(2);
this.initData();
}
@ -708,7 +711,10 @@
.tool-jiesuan {}
.jiesuan-btn {
width: 240rpx;
max-width: 240rpx;
min-width: 100px;
font-size: 16px;
flex: 1;
height: 50px;
line-height: 50px;
text-align: center;

35
physical-merchants/classify/goods-search/goods-search.vue
Unescape View File

@ -122,27 +122,30 @@
getListGoodsDetail(params).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
setTimeout(()=>{
uni.hideLoading();
if (res.return_code == '000000') {
if (res.return_data.list.length > 0) {
_this.data_list = _this.data_list.concat(res.return_data.list);
this.page.pageStart = res.return_data.pageNum;
this.page.pageSize = res.return_data.pageSize;
this.page.total = res.return_data.total;
this.page.navigateLastPage = res.return_data.navigateLastPage
if (res.return_data.list.length > 0) {
_this.data_list = _this.data_list.concat(res.return_data.list);
this.page.pageStart = res.return_data.pageNum;
this.page.pageSize = res.return_data.pageSize;
this.page.total = res.return_data.total;
this.page.navigateLastPage = res.return_data.navigateLastPage
} else {
_this.data_list = []
}
} else {
_this.data_list = []
uni.showToast({
title: res.return_msg,
icon: 'none',
duration: 2000
})
}
},100)
} else {
uni.showToast({
title: res.return_msg,
icon: 'none',
duration: 2000
})
}
})
}
}

39
physical-merchants/classify/goodsDetail/goodsDetail.vue
Unescape View File

@ -282,26 +282,33 @@
});
findGoodsDetailById(params).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
setTimeout(()=>{
this.goodsDetail = res.return_data;
this.goodsDetail.bannerImg = res.return_data.bannerImg.split(",").map(temp => this
.imageUrl + temp);
this.goodsDetail.detailImg = res.return_data.detailImg.split(",").map(temp => this
.imageUrl + temp);
console.log(this.goodsDetail, )
uni.hideLoading();
if (res.return_code == '000000') {
this.goodsDetail = res.return_data;
this.goodsDetail.bannerImg = res.return_data.bannerImg.split(",").map(temp => this
.imageUrl + temp);
this.goodsDetail.detailImg = res.return_data.detailImg.split(",").map(temp => this
.imageUrl + temp);
console.log(this.goodsDetail, )
// let list =item.map(temp=>this.imageUrl + temp)
} else {
uni.showToast({
title: res.return_msg,
icon: 'none',
duration: 2000
})
}
},100)
// let list =item.map(temp=>this.imageUrl + temp)
} else {
uni.showToast({
title: res.return_msg,
icon: 'none',
duration: 2000
})
}
})
},

7
physical-merchants/classify/order/orderDetail.vue
Unescape View File

@ -370,7 +370,12 @@
orderNo: this.orderId,
}
getDetailByOrderNo(params).then(res => {
uni.hideLoading();
setTimeout(()=>{
uni.hideLoading();
},100)
if (res.return_code == '000000') {
this.recinfo = res.return_data;
// if (res.return_data.productType == 6) {

5
physical-merchants/classify/order/paymentResult.vue
Unescape View File

@ -75,7 +75,10 @@
orderNo: this.orderId,
}
getDetailByOrderNo(params).then(res => {
uni.hideLoading();
setTimeout(()=>{
uni.hideLoading();
},100)
if (res.return_code == '000000') {
this.recinfo = res.return_data;

69
physical-merchants/classify/order/wuliuPupup/wuliuPupup.vue
Unescape View File

@ -154,48 +154,53 @@
mask:true,
});
getLogisticsMsg(params).then(res=>{
uni.hideLoading();
if (res.return_code == '000000') {
this.tracesData=res.return_data;
this.tracesData.logisticsTraceDetails =JSON.parse(this.tracesData.logisticsTraceDetails)
setTimeout(()=>{
this.tracesData.logisticsTraceDetails=this.tracesData.logisticsTraceDetails.sort((item,item2)=>{
uni.hideLoading();
if (res.return_code == '000000') {
if(item.logisticsStatus == 'TRANSPORT'){
item.isMainNode=false;
}else{
item.isMainNode=true;
}
return item2.time - item.time;
})
this.tracesData=res.return_data;
this.tracesData.logisticsTraceDetails =JSON.parse(this.tracesData.logisticsTraceDetails)
this.tracesData.logisticsTraceDetails=this.tracesData.logisticsTraceDetails.sort((item,item2)=>{
let mobile = /(1[0-9]{10})|([0-9]{3,4})?[0-9]{7,8}/g; //匹配手机号或固话
let phone = [];
this.tracesData.logisticsTraceDetails.map(item=>{
// 提取电话号码
// if(item.logisticsStatus == 'SIGN'||item.logisticsStatus == 'DELIVERING'){
let num = item.desc.replace(/\s|[(]|[)]|[（]|[）]|[-]*/g, ''); //去除字符串中所有空格、小括号和横杠
if(num.match(mobile)){
phone.push((num.match(mobile)))
if(item.logisticsStatus == 'TRANSPORT'){
item.isMainNode=false;
}else{
item.isMainNode=true;
}
// }
})
return item2.time - item.time;
})
this.phoneNumber =phone.flat(Infinity);
// console.log(this.phoneNumber, phone)
let mobile = /(1[0-9]{10})|([0-9]{3,4})?[0-9]{7,8}/g; //匹配手机号或固话
let phone = [];
this.tracesData.logisticsTraceDetails.map(item=>{
// 提取电话号码
// if(item.logisticsStatus == 'SIGN'||item.logisticsStatus == 'DELIVERING'){
let num = item.desc.replace(/\s|[(]|[)]|[（]|[）]|[-]*/g, ''); //去除字符串中所有空格、小括号和横杠
if(num.match(mobile)){
phone.push((num.match(mobile)))
}
// }
})
this.phoneNumber =phone.flat(Infinity);
// console.log(this.phoneNumber, phone)
} else {
uni.showToast({
title: res.return_msg,
icon: 'none',
duration: 2000
})
}
},100)
} else {
uni.showToast({
title: res.return_msg,
icon: 'none',
duration: 2000
})
}
})
},
// 复制

4
physical-merchants/settleAccounts/settleAccounts.vue
Unescape View File

@ -478,7 +478,9 @@
});
this.postPrice = 0;
getAddressPrice().then(res => {
uni.hideLoading();
setTimeout(()=>{
uni.hideLoading();
},100)
this.isFirstSearchAddress = false;
if (res.return_code == '000000') {
if (res.return_data) {

Write Preview
Loading…
Cancel
Save