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

1.新增实物商品

Browse Source 
2.新增车队油卡支付模式
yj-dev
杨杰 2 years ago
parent 7780c061b4
commit ddb554c491
5 changed files with 225 additions and 170 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. 2
      pages/goods/refuel-confirm/refuel-confirm.vue
  2. 29
      pages/order/confirmation.vue
  3. 60
      pages/user/order_details/order_details.vue
  4. 2
      subPages/coupon-packge-details/coupon-packge-details.vue
  5. 6
      subPages/lottery/lottery.vue

2
pages/goods/refuel-confirm/refuel-confirm.vue
Unescape View File

@ -369,7 +369,7 @@
type: 3
}
getUserCardList(datas).then(res => {
if (res.return_code == '000000') {
if (res.return_code == '000000' && res.return_data !='') {
this.oilUserCardlist = res.return_data;
this.oilUserno = res.return_data[0].cardNo;
this.contactName = res.return_data[0].contactName;

29
pages/order/confirmation.vue
Unescape View File

@ -95,6 +95,23 @@
</view>
</view>
<!-- //实物配置 -->
<view class="width94 backcorfff mart10" v-if="couponList.wherePost">
<view class="width94 alijusstart height50 font14 fcor666 bor-botm1">
<view class="width40 fcor333 fontwig6 font16" style="padding-left: 2%;">联系人</view>
<input class="width60 fotrt font15" v-model="contactPepole" placeholder="请输入联系人" />
</view>
<view class="width94 alijusstart height50 font14 fcor666 bor-botm1">
<view class="width40 fcor333 fontwig6 font16" style="padding-left: 2%;">联系电话</view>
<input class="width60 fotrt font15" v-model="contactPhone" placeholder="请输入联系电话" />
</view>
<view class="width94 alijusstart height50 font14 fcor666">
<view class="width40 fcor333 fontwig6 font16" style="padding-left: 2%;">联系地址</view>
<input class="width60 fotrt font15" v-model="contactAddress" placeholder="请输入联系地址" />
</view>
</view>
<view class="width94 comorder mart10">
<view class="height50 width100 backcorfff">
<view class="width100 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
@ -244,7 +261,10 @@
coupondiscountid: '',
orderDetails: '', //订单详情
payGold: '', //积分数
identificationCode: '' //渠道商
identificationCode: '', //渠道商
contactPepole: '', //联系人
contactPhone: '', //联系电话
contactAddress: '' //联系地址
};
},
onLoad(option) {
@ -458,7 +478,12 @@
"goodsId": this.couponId,
"saleCount": 1,
"storeId": this.storeId
}]
}],
"postData": {
"address": this.contactAddress,
"user": this.contactPepole,
"phone": this.contactPhone
}
}
addOrder(goods).then(res => {
uni.hideLoading();

60
pages/user/order_details/order_details.vue
Unescape View File

@ -14,9 +14,11 @@
<view class="row">
<view class="goods-info">
<view class="img">
<image mode="widthFix" :src="imageUrl+rec.goodsImg" v-if="rec.goodsType == 1 || rec.goodsType == 7"></image>
<image mode="widthFix" :src="imageUrl+rec.goodsImg"
v-if="rec.goodsType == 1 || rec.goodsType == 7"></image>
<image mode="widthFix" :src="imagewxUrl+imgadres1" v-if="rec.goodsType == 6"></image>
<image mode="widthFix" :src="rec.goodsImg" v-if="rec.goodsType != 1 && rec.goodsType != 6 && rec.goodsType != 7"></image>
<image mode="widthFix" :src="rec.goodsImg"
v-if="rec.goodsType != 1 && rec.goodsType != 6 && rec.goodsType != 7"></image>
</view>
<view class="info">
<view class="title">{{rec.goodsName}}</view>
@ -110,8 +112,7 @@
￥{{recinfo.totalPrice}}
</view>
<view class="right" v-else>
<image style="width: 15px;height: 15px;vertical-align: sub;"
src="../../../static/img/jfx.png">
<image style="width: 15px;height: 15px;vertical-align: sub;" src="../../../static/img/jfx.png">
</image>{{(recinfo.totalPrice * 10 * 10).toFixed(0)}}
</view>
</view>
@ -123,8 +124,7 @@
￥{{recinfo.payPrice}}
</view>
<view class="right" v-else>
<image style="width: 15px;height: 15px;vertical-align: sub;"
src="../../../static/img/jfx.png">
<image style="width: 15px;height: 15px;vertical-align: sub;" src="../../../static/img/jfx.png">
</image>{{(recinfo.payPrice* 10 * 10).toFixed(0)}}
</view>
</view>
@ -136,8 +136,7 @@
￥{{recinfo.payRealPrice}}
</view>
<view class="right" v-else>
<image style="width: 15px;height: 15px;vertical-align: sub;"
src="../../../static/img/jfx.png">
<image style="width: 15px;height: 15px;vertical-align: sub;" src="../../../static/img/jfx.png">
</image>{{(recinfo.payRealPrice * 10 * 10).toFixed(0)}}
</view>
</view>
@ -149,8 +148,7 @@
￥{{recinfo.deductionPrice}}
</view>
<view class="right" v-else>
<image style="width: 15px;height: 15px;vertical-align: sub;"
src="../../../static/img/jfx.png">
<image style="width: 15px;height: 15px;vertical-align: sub;" src="../../../static/img/jfx.png">
</image>{{(recinfo.deductionPrice * 10 * 10).toFixed(0)}}
</view>
</view>
@ -194,6 +192,30 @@
{{recinfo.refusalRefundContent}}
</view>
</view>
<view class="row" v-if="materialData">
<view class="left">
联系人 :
</view>
<view class="right">
{{materialData.user}}
</view>
</view>
<view class="row" v-if="materialData">
<view class="left">
联系电话 :
</view>
<view class="right">
{{materialData.phone}}
</view>
</view>
<view class="row" v-if="materialData">
<view class="left">
联系地址 :
</view>
<view class="right">
{{materialData.address}}
</view>
</view>
<view class="row" v-if="recinfo.finishTime">
<view class="left">
完成时间 :
@ -297,8 +319,7 @@
<view class="sum">合计:
<view class="money" v-if="recinfo.payType != 3">￥{{recinfo.payPrice}}</view>
<view class="money" v-else>
<image style="width: 15px;height: 15px;vertical-align: sub;"
src="../../../static/img/jfx.png">
<image style="width: 15px;height: 15px;vertical-align: sub;" src="../../../static/img/jfx.png">
</image>{{recinfo.payPrice*100}}
</view>
</view>
@ -332,7 +353,8 @@
imageUrl: app.globalData.imgUrl,
imagewxUrl: app.globalData.imageWxImg,
imgadres1: 'dhf.png',
preByOrderInfo:''
preByOrderInfo: '',
materialData: '' //实物参数
};
},
@ -392,6 +414,9 @@
if (res.return_code == '000000') {
uni.hideLoading();
this.recinfo = res.return_data;
if (res.return_data.remarks) {
this.materialData = JSON.parse(res.return_data.remarks);
}
} else {
uni.hideLoading()
}
@ -409,7 +434,7 @@
})
},
//预约商品完成
orderComplete(){
orderComplete() {
let that = this;
uni.showModal({
title: '预约完成',
@ -420,7 +445,7 @@
title: '加载中...'
})
let params = {
preOrderId : this.preByOrderInfo.id
preOrderId: this.preByOrderInfo.id
}
orderComplete(params).then(res => {
if (res.return_code == '000000') {
@ -507,7 +532,8 @@
uni.redirectTo({
url: "/pages/pay/payment/payment?amount=" + this.recinfo.payPrice +
'&paytype=' + payTypes + '&orderId=' + this.recinfo.id + '&couponId=' + this.recinfo
.highChildOrderList[0].goodsId + '&typeaout='+ this.recinfo.highChildOrderList[0].ext1+'&goodsType='+ this.recinfo.highChildOrderList[0].goodsType
.highChildOrderList[0].goodsId + '&typeaout=' + this.recinfo.highChildOrderList[0].ext1 +
'&goodsType=' + this.recinfo.highChildOrderList[0].goodsType
})
},
}
@ -719,7 +745,7 @@
font-size: 20px;
font-weight: 600;
display: flex;
align-items: center;
align-items: center;
}
}

2
subPages/coupon-packge-details/coupon-packge-details.vue
Unescape View File

@ -19,7 +19,7 @@
</view>
<!-- 商品主图轮播 -->
<view class="swiper-box">
<swiper circular="true" autoplay="true" @change="swiperChange">
<swiper circular="true" autoplay="true" style="height: 188px;" @change="swiperChange">
<swiper-item v-for="(swiper,index) in swiperList" :key="index">
<image mode="widthFix" :src="imageUrl+swiper" @click="perImage(swiper)"></image>
</swiper-item>

6
subPages/lottery/lottery.vue
Unescape View File

@ -193,6 +193,7 @@
couponId: this.couponId
}
getActivityByCoupon(params).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
let prizeLists = res.return_data.activityAward;
this.activityId = res.return_data.activityInfo.id;
@ -287,7 +288,10 @@
},
onLoad(options) {
this.couponId = options.id
this.handleInitCanvas()
// this.handleInitCanvas();
},
onShow() {
this.handleInitCanvas();
},
onUnload() {
uni.hideLoading()

Write Preview
Loading…
Cancel
Save