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

Merge branch 'youmengting-dev' of http://gitea.dctpay.com/yangjie/high-mini into new-dev

Browse Source
master
杨杰 2 years ago
parent aecb02e838 5b26b552a8
commit 5c9bf2a986
9 changed files with 189 additions and 133 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. 74
      physical-merchants/classify/cart/cart.vue
  4. 39
      physical-merchants/classify/goods-search/goods-search.vue
  5. 39
      physical-merchants/classify/goodsDetail/goodsDetail.vue
  6. 28
      physical-merchants/classify/order/orderDetail.vue
  7. 5
      physical-merchants/classify/order/paymentResult.vue
  8. 79
      physical-merchants/classify/order/wuliuPupup/wuliuPupup.vue
  9. 6
      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 class="form-gorup-title">联系人<text class="form-group-tips-must">*</text>
</view> </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个字符"> placeholder-class="corf6" class="fcor666 bs-bb" placeholder="联系人2~5个字符">
<view class="width100 mart10 border-b"> <view class="width100 mart10 border-b">
@ -114,6 +114,17 @@
onLoad(params) { onLoad(params) {
this.dataParams = 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: { computed: {
// regionName() { // regionName() {

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

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

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

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

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

@ -48,7 +48,7 @@
} }
}, },
onLoad(options){ onLoad(options){
console.log(options,"options") // console.log(options,"options")
if(options.goodsLabel){ if(options.goodsLabel){
this.goodsLabel = options.goodsLabel this.goodsLabel = options.goodsLabel
@ -122,27 +122,30 @@
getListGoodsDetail(params).then(res => { getListGoodsDetail(params).then(res => {
uni.hideLoading(); setTimeout(()=>{
if (res.return_code == '000000') { uni.hideLoading();
if (res.return_code == '000000') {
if (res.return_data.list.length > 0) { if (res.return_data.list.length > 0) {
_this.data_list = _this.data_list.concat(res.return_data.list); _this.data_list = _this.data_list.concat(res.return_data.list);
this.page.pageStart = res.return_data.pageNum; this.page.pageStart = res.return_data.pageNum;
this.page.pageSize = res.return_data.pageSize; this.page.pageSize = res.return_data.pageSize;
this.page.total = res.return_data.total; this.page.total = res.return_data.total;
this.page.navigateLastPage = res.return_data.navigateLastPage this.page.navigateLastPage = res.return_data.navigateLastPage
} else {
_this.data_list = []
}
} else { } 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 => { findGoodsDetailById(params).then(res => {
uni.hideLoading();
setTimeout(()=>{
uni.hideLoading();
if (res.return_code == '000000') { if (res.return_code == '000000') {
this.goodsDetail = res.return_data; this.goodsDetail = res.return_data;
this.goodsDetail.bannerImg = res.return_data.bannerImg.split(",").map(temp => this this.goodsDetail.bannerImg = res.return_data.bannerImg.split(",").map(temp => this
.imageUrl + temp); .imageUrl + temp);
this.goodsDetail.detailImg = res.return_data.detailImg.split(",").map(temp => this this.goodsDetail.detailImg = res.return_data.detailImg.split(",").map(temp => this
.imageUrl + temp); .imageUrl + temp);
console.log(this.goodsDetail, ) console.log(this.goodsDetail, )
// let list =item.map(temp=>this.imageUrl + temp) // let list =item.map(temp=>this.imageUrl + temp)
} else { } else {
uni.showToast({ uni.showToast({
title: res.return_msg, title: res.return_msg,
icon: 'none', icon: 'none',
duration: 2000 duration: 2000
}) })
} }
},100)
}) })
}, },

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

@ -1,5 +1,5 @@
<template> <template>
<view class="backcor9 pd-main pdb50 headsbg"> <view class="backcor9 pd-main pdb60 headsbg">
<!-- 待支付 --> <!-- 待支付 -->
@ -264,7 +264,18 @@
</view> --> </view> -->
<view v-if="recinfo.orderStatus != 1" class="toPay font14 backcolorfff"> <view v-if="recinfo.orderStatus != 1" class="toPay font14 backcolorfff">
<!-- #ifdef MP-->
<button open-type="contact" class="btn" style="margin: 0; box-sizing: content-box;line-height: unset;">
联系客服
<!-- <image src="../../../static/img/home/cusser.png" mode="widthFix" class="icon30"></image> -->
</button>
<!-- #endif -->
<!-- #ifdef H5-->
<view class="btn" @click="playPhone">联系客服</view> <view class="btn" @click="playPhone">联系客服</view>
<!-- #endif -->
</view> </view>
<wuliuPopup ref="wuliu"></wuliuPopup> <wuliuPopup ref="wuliu"></wuliuPopup>
</view> </view>
@ -370,7 +381,12 @@
orderNo: this.orderId, orderNo: this.orderId,
} }
getDetailByOrderNo(params).then(res => { getDetailByOrderNo(params).then(res => {
uni.hideLoading();
setTimeout(()=>{
uni.hideLoading();
},100)
if (res.return_code == '000000') { if (res.return_code == '000000') {
this.recinfo = res.return_data; this.recinfo = res.return_data;
// if (res.return_data.productType == 6) { // if (res.return_data.productType == 6) {
@ -504,7 +520,7 @@
url: '/physical-merchants/classify/order/pay?obj=' + obj url: '/physical-merchants/classify/order/pay?obj=' + obj
}) })
}, },
//拨打客服电话 //联系客服
playPhone() { playPhone() {
uni.showModal({ uni.showModal({
title: '客服', title: '客服',
@ -666,8 +682,8 @@
border-radius: 15px; border-radius: 15px;
} }
.pdb50 { .pdb60 {
padding-bottom: 50px; padding-bottom: 60px;
} }
// 底部待支付按钮 // 底部待支付按钮
@ -691,7 +707,7 @@
margin-left: 15px; margin-left: 15px;
border: 1px solid #666666; border: 1px solid #666666;
color: #666666; color: #666666;
font-size: 16px;
&.bgred { &.bgred {
color: #ffffff; color: #ffffff;
background-color: #FF2342; background-color: #FF2342;

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

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

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

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

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

@ -478,7 +478,9 @@
}); });
this.postPrice = 0; this.postPrice = 0;
getAddressPrice().then(res => { getAddressPrice().then(res => {
uni.hideLoading(); setTimeout(()=>{
uni.hideLoading();
},100)
this.isFirstSearchAddress = false; this.isFirstSearchAddress = false;
if (res.return_code == '000000') { if (res.return_code == '000000') {
if (res.return_data) { if (res.return_data) {
@ -730,7 +732,7 @@
uni.showLoading({ uni.showLoading({
title: '支付中...' title: ''
}) })
createOrder(params).then(res => { createOrder(params).then(res => {
uni.hideLoading(); uni.hideLoading();

Write Preview
Loading…
Cancel
Save