Compare commits

..

No commits in common. '0554e4591e2097c807057ec309394c0eab08c7d9' and 'aecb02e8389a1cca498cb5b37cc56d00f83833c2' have entirely different histories.

  1. 13
      physical-merchants/address/addNewAddress/addNewAddress.vue
  2. 5
      physical-merchants/address/address.vue
  3. 28
      physical-merchants/classify/cart/cart.vue
  4. 5
      physical-merchants/classify/goods-search/goods-search.vue
  5. 7
      physical-merchants/classify/goodsDetail/goodsDetail.vue
  6. 26
      physical-merchants/classify/order/orderDetail.vue
  7. 3
      physical-merchants/classify/order/paymentResult.vue
  8. 5
      physical-merchants/classify/order/wuliuPupup/wuliuPupup.vue
  9. 4
      physical-merchants/settleAccounts/settleAccounts.vue
  10. 20
      subPages/recharge-centre/recharge-centre.vue
  11. 4
      subPages/unionComfirmation/unionComfirmation.vue

@ -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" <input type="text" name="name" v-model="userAddress.name" maxlength="5"
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,17 +114,6 @@
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() {

@ -84,9 +84,6 @@
}); });
this.addressList=[]; this.addressList=[];
getDeliveryAddressList().then(res => { getDeliveryAddressList().then(res => {
setTimeout(()=>{
uni.hideLoading(); uni.hideLoading();
if (res.return_code == '000000') { if (res.return_code == '000000') {
@ -107,7 +104,7 @@
duration: 2000 duration: 2000
}) })
} }
},100)
}) })
}, },

@ -82,7 +82,7 @@
</label> </label>
<!-- --> <!-- -->
</checkbox-group> </checkbox-group>
<view v-if="!isEdit" class="paddleft5 paddtright5 fcorred " @click="editDelete">编辑</view> <view v-if="!isEdit" class="paddleft5 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,18 +208,19 @@
this.initData(); this.initData();
}, },
methods: { methods: {
initData() { initData(status) {
if(!status){
uni.showLoading({ uni.showLoading({
title: '加载中', title: '加载中',
mask:true, mask:true,
duration:2000 duration:2000
}); });
// console.log(20)
}
getShoppingCartList().then(res => { getShoppingCartList().then(res => {
setTimeout(()=>{ if(!status){
uni.hideLoading(); uni.hideLoading();
}
if (res.return_code == '000000') { if (res.return_code == '000000') {
this.allCheck.whetherCheck = false; this.allCheck.whetherCheck = false;
this.cartList = res.return_data; this.cartList = res.return_data;
@ -227,6 +228,8 @@
// //
// this.cartList[0].loseEfficacy=true; // this.cartList[0].loseEfficacy=true;
this.allCheckInit(); // this.allCheckInit(); //
} else { } else {
@ -236,9 +239,6 @@
duration: 2000 duration: 2000
}) })
} }
},100)
}) })
}, },
editDelete() { editDelete() {
@ -504,16 +504,13 @@
this.initData(); this.initData();
} else { } else {
// //
setTimeout(()=>{
uni.showToast({ uni.showToast({
title: res.return_msg, title: res.return_msg,
icon: 'none', icon: 'none',
duration: 2000 duration: 2000
}) })
},200)
// //
this.initData(); this.initData(2);
} }
@ -711,10 +708,7 @@
.tool-jiesuan {} .tool-jiesuan {}
.jiesuan-btn { .jiesuan-btn {
max-width: 240rpx; 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;

@ -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,7 +122,6 @@
getListGoodsDetail(params).then(res => { getListGoodsDetail(params).then(res => {
setTimeout(()=>{
uni.hideLoading(); uni.hideLoading();
if (res.return_code == '000000') { if (res.return_code == '000000') {
@ -144,8 +143,6 @@
duration: 2000 duration: 2000
}) })
} }
},100)
}) })
} }
} }

@ -282,9 +282,6 @@
}); });
findGoodsDetailById(params).then(res => { findGoodsDetailById(params).then(res => {
setTimeout(()=>{
uni.hideLoading(); uni.hideLoading();
if (res.return_code == '000000') { if (res.return_code == '000000') {
@ -305,10 +302,6 @@
duration: 2000 duration: 2000
}) })
} }
},100)
}) })
}, },

@ -1,5 +1,5 @@
<template> <template>
<view class="backcor9 pd-main pdb60 headsbg"> <view class="backcor9 pd-main pdb50 headsbg">
<!-- 待支付 --> <!-- 待支付 -->
@ -264,18 +264,7 @@
</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>
@ -381,12 +370,7 @@
orderNo: this.orderId, orderNo: this.orderId,
} }
getDetailByOrderNo(params).then(res => { getDetailByOrderNo(params).then(res => {
setTimeout(()=>{
uni.hideLoading(); 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) {
@ -520,7 +504,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: '客服',
@ -682,8 +666,8 @@
border-radius: 15px; border-radius: 15px;
} }
.pdb60 { .pdb50 {
padding-bottom: 60px; padding-bottom: 50px;
} }
// //
@ -707,7 +691,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;

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

@ -154,9 +154,6 @@
mask:true, mask:true,
}); });
getLogisticsMsg(params).then(res=>{ getLogisticsMsg(params).then(res=>{
setTimeout(()=>{
uni.hideLoading(); uni.hideLoading();
if (res.return_code == '000000') { if (res.return_code == '000000') {
@ -199,8 +196,6 @@
duration: 2000 duration: 2000
}) })
} }
},100)
}) })
}, },
// //

@ -478,9 +478,7 @@
}); });
this.postPrice = 0; this.postPrice = 0;
getAddressPrice().then(res => { getAddressPrice().then(res => {
setTimeout(()=>{
uni.hideLoading(); 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) {
@ -732,7 +730,7 @@
uni.showLoading({ uni.showLoading({
title: '' title: '支付中...'
}) })
createOrder(params).then(res => { createOrder(params).then(res => {
uni.hideLoading(); uni.hideLoading();

@ -266,10 +266,6 @@
this.explainReceiptTime = this.tabs[this.swiperTabIdx].explain_receipt_time; this.explainReceiptTime = this.tabs[this.swiperTabIdx].explain_receipt_time;
this.amountList = this.tabs[this.swiperTabIdx].priceList; this.amountList = this.tabs[this.swiperTabIdx].priceList;
this.amoutType = this.tabs[this.swiperTabIdx].id; this.amoutType = this.tabs[this.swiperTabIdx].id;
this.inputAmount = '';
this.price = '';
this.inputAmountId = '';
this.amoutstatus = '';
}, },
// //
SwiperChange: function(e) { SwiperChange: function(e) {
@ -278,10 +274,6 @@
this.explainReceiptTime = this.tabs[this.swiperTabIdx].explain_receipt_time; this.explainReceiptTime = this.tabs[this.swiperTabIdx].explain_receipt_time;
this.amountList = this.tabs[this.swiperTabIdx].priceList; this.amountList = this.tabs[this.swiperTabIdx].priceList;
this.amoutType = this.tabs[this.swiperTabIdx].id; this.amoutType = this.tabs[this.swiperTabIdx].id;
this.inputAmount = '';
this.price = '';
this.inputAmountId = '';
this.amoutstatus = '';
}, },
/** /**
* 提交订单 * 提交订单
@ -320,19 +312,9 @@
}); });
return false; return false;
} }
let cztype = '';
if (that.swiperTabIdx == 0) {
cztype = '中国电信'
}
if (that.swiperTabIdx == 1) {
cztype = '中国移动'
}
if (that.swiperTabIdx == 2) {
cztype = '中国联通'
}
uni.showModal({ uni.showModal({
title: '请确认充值号码', title: '请确认充值号码',
content: cztype + ' : ' + that.inputPhone + ',充值金额 : ' + that.inputAmount + '元,充值成功后无法退款', content: '充值号码 : ' + that.inputPhone + ',充值成功后无法退款',
success: function(res) { success: function(res) {
if (res.confirm) { if (res.confirm) {
uni.navigateTo({ uni.navigateTo({

@ -166,7 +166,7 @@
<view class="width20 fotrt"> <view class="width20 fotrt">
<view> <view>
<radio color="#0083f5" <radio color="#0083f5"
v-if="items.discountCondition && orderPrice >= items.discountCondition" v-if="items.discountCondition && orderPrice > items.discountCondition"
:checked="items.id == memDiscountId" /> :checked="items.id == memDiscountId" />
<radio color="#0083f5" <radio color="#0083f5"
v-if="items.discountCondition && orderPrice < items.discountCondition" disabled="true" v-if="items.discountCondition && orderPrice < items.discountCondition" disabled="true"
@ -379,7 +379,7 @@
this.memDiscountId = item.id; this.memDiscountId = item.id;
if (item.discountType == 1) { if (item.discountType == 1) {
// //
if (this.orderPrice >= item.discountCondition) { if (this.orderPrice > item.discountCondition) {
this.memDiscountId = item.id; this.memDiscountId = item.id;
// //
this.deductionPrice = item.discountPrice; this.deductionPrice = item.discountPrice;

Loading…
Cancel
Save