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. 356
      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 type: 3
} }
getUserCardList(datas).then(res => { getUserCardList(datas).then(res => {
if (res.return_code == '000000') { if (res.return_code == '000000' && res.return_data !='') {
this.oilUserCardlist = res.return_data; this.oilUserCardlist = res.return_data;
this.oilUserno = res.return_data[0].cardNo; this.oilUserno = res.return_data[0].cardNo;
this.contactName = res.return_data[0].contactName; this.contactName = res.return_data[0].contactName;

29
pages/order/confirmation.vue
Unescape View File

@ -95,6 +95,23 @@
</view> </view>
</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="width94 comorder mart10">
<view class="height50 width100 backcorfff"> <view class="height50 width100 backcorfff">
<view class="width100 flleft fcor333 fontwig6 font16" style="padding-left: 4%;"> <view class="width100 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
@ -244,7 +261,10 @@
coupondiscountid: '', coupondiscountid: '',
orderDetails: '', //订单详情 orderDetails: '', //订单详情
payGold: '', //积分数 payGold: '', //积分数
identificationCode: '' //渠道商 identificationCode: '', //渠道商
contactPepole: '', //联系人
contactPhone: '', //联系电话
contactAddress: '' //联系地址
}; };
}, },
onLoad(option) { onLoad(option) {
@ -458,7 +478,12 @@
"goodsId": this.couponId, "goodsId": this.couponId,
"saleCount": 1, "saleCount": 1,
"storeId": this.storeId "storeId": this.storeId
}] }],
"postData": {
"address": this.contactAddress,
"user": this.contactPepole,
"phone": this.contactPhone
}
} }
addOrder(goods).then(res => { addOrder(goods).then(res => {
uni.hideLoading(); uni.hideLoading();

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

@ -14,9 +14,11 @@
<view class="row"> <view class="row">
<view class="goods-info"> <view class="goods-info">
<view class="img"> <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="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>
<view class="info"> <view class="info">
<view class="title">{{rec.goodsName}}</view> <view class="title">{{rec.goodsName}}</view>
@ -73,9 +75,9 @@
</view> </view>
<view class="right" v-if="recinfo.payModel == 3"> <view class="right" v-if="recinfo.payModel == 3">
混合 混合
</view> </view>
<view class="right" v-if="recinfo.payModel == 4"> <view class="right" v-if="recinfo.payModel == 4">
油卡 油卡
</view> </view>
</view> </view>
@ -97,9 +99,9 @@
</view> </view>
<view class="right" v-if="recinfo.payType == 5"> <view class="right" v-if="recinfo.payType == 5">
银联支付 银联支付
</view> </view>
<view class="right" v-if="recinfo.payType == 7"> <view class="right" v-if="recinfo.payType == 7">
嗨森逛油卡 嗨森逛油卡
</view> </view>
</view> </view>
<view class="row" v-if="recinfo.totalPrice"> <view class="row" v-if="recinfo.totalPrice">
@ -110,8 +112,7 @@
￥{{recinfo.totalPrice}} ￥{{recinfo.totalPrice}}
</view> </view>
<view class="right" v-else> <view class="right" v-else>
<image style="width: 15px;height: 15px;vertical-align: sub;" <image style="width: 15px;height: 15px;vertical-align: sub;" src="../../../static/img/jfx.png">
src="../../../static/img/jfx.png">
</image>{{(recinfo.totalPrice * 10 * 10).toFixed(0)}} </image>{{(recinfo.totalPrice * 10 * 10).toFixed(0)}}
</view> </view>
</view> </view>
@ -123,8 +124,7 @@
￥{{recinfo.payPrice}} ￥{{recinfo.payPrice}}
</view> </view>
<view class="right" v-else> <view class="right" v-else>
<image style="width: 15px;height: 15px;vertical-align: sub;" <image style="width: 15px;height: 15px;vertical-align: sub;" src="../../../static/img/jfx.png">
src="../../../static/img/jfx.png">
</image>{{(recinfo.payPrice* 10 * 10).toFixed(0)}} </image>{{(recinfo.payPrice* 10 * 10).toFixed(0)}}
</view> </view>
</view> </view>
@ -136,8 +136,7 @@
￥{{recinfo.payRealPrice}} ￥{{recinfo.payRealPrice}}
</view> </view>
<view class="right" v-else> <view class="right" v-else>
<image style="width: 15px;height: 15px;vertical-align: sub;" <image style="width: 15px;height: 15px;vertical-align: sub;" src="../../../static/img/jfx.png">
src="../../../static/img/jfx.png">
</image>{{(recinfo.payRealPrice * 10 * 10).toFixed(0)}} </image>{{(recinfo.payRealPrice * 10 * 10).toFixed(0)}}
</view> </view>
</view> </view>
@ -149,18 +148,17 @@
￥{{recinfo.deductionPrice}} ￥{{recinfo.deductionPrice}}
</view> </view>
<view class="right" v-else> <view class="right" v-else>
<image style="width: 15px;height: 15px;vertical-align: sub;" <image style="width: 15px;height: 15px;vertical-align: sub;" src="../../../static/img/jfx.png">
src="../../../static/img/jfx.png">
</image>{{(recinfo.deductionPrice * 10 * 10).toFixed(0)}} </image>{{(recinfo.deductionPrice * 10 * 10).toFixed(0)}}
</view> </view>
</view> </view>
<view class="row" v-if="recinfo.payGold"> <view class="row" v-if="recinfo.payGold">
<view class="left"> <view class="left">
积分抵扣 : 积分抵扣 :
</view> </view>
<view class="right"> <view class="right">
￥{{(recinfo.payGold / 100).toFixed(2)}} ￥{{(recinfo.payGold / 100).toFixed(2)}}
</view> </view>
</view> </view>
<view class="row"> <view class="row">
<view class="left"> <view class="left">
@ -193,112 +191,135 @@
<view class="right"> <view class="right">
{{recinfo.refusalRefundContent}} {{recinfo.refusalRefundContent}}
</view> </view>
</view>
<view class="row" v-if="recinfo.finishTime">
<view class="left">
完成时间 :
</view>
<view class="right">
{{recinfo.finishTime | formatDate('-')}}
</view>
</view>
</view>
<!-- 优选商品 -->
<view class="width94 font18 fcor333 fontwig6 height40" v-if="preByOrderInfo">预约订单详情</view>
<view class="order" v-if="preByOrderInfo">
<view class="row">
<view class="left">
预约状态 :
</view>
<view class="right" v-if="preByOrderInfo.status == 1">
预约中
</view>
<view class="right" v-if="preByOrderInfo.status == 2">
预约成功
</view>
<view class="right" v-if="preByOrderInfo.status == 3">
预约完成
</view>
<view class="right" v-if="preByOrderInfo.status == 4">
预约失败
</view>
<view class="right" v-if="preByOrderInfo.status == 5">
预约取消
</view>
</view> </view>
<view class="row"> <view class="row" v-if="materialData">
<view class="left"> <view class="left">
预约订单号 : 联系人 :
</view> </view>
<view class="right"> <view class="right">
{{preByOrderInfo.preOrderNo}} {{materialData.user}}
</view> </view>
</view> </view>
<view class="row" v-if="preByOrderInfo.opUserName"> <view class="row" v-if="materialData">
<view class="left"> <view class="left">
预约门店 : 联系电话 :
</view> </view>
<view class="right"> <view class="right">
{{preByOrderInfo.opUserName}} {{materialData.phone}}
</view> </view>
</view> </view>
<view class="row" v-if="preByOrderInfo.reachAddress"> <view class="row" v-if="materialData">
<view class="left"> <view class="left">
到店地点 : 联系地址 :
</view> </view>
<view class="right"> <view class="right">
{{preByOrderInfo.reachAddress}} {{materialData.address}}
</view>
</view>
<view class="row" v-if="preByOrderInfo.reachTime">
<view class="left">
到店时间 :
</view>
<view class="right">
{{preByOrderInfo.reachTime | formatDate('-')}}
</view>
</view>
<view class="row" v-if="preByOrderInfo.statusFailDesc">
<view class="left">
预约失败说明 :
</view> </view>
<view class="right"> </view>
{{preByOrderInfo.statusFailDesc}} <view class="row" v-if="recinfo.finishTime">
</view> <view class="left">
</view> 完成时间 :
<view class="row" v-if="preByOrderInfo.statusCancelDesc"> </view>
<view class="left"> <view class="right">
预约取消说明 : {{recinfo.finishTime | formatDate('-')}}
</view> </view>
<view class="right"> </view>
{{preByOrderInfo.statusCancelDesc}} </view>
</view> <!-- 优选商品 -->
</view> <view class="width94 font18 fcor333 fontwig6 height40" v-if="preByOrderInfo">预约订单详情</view>
<view class="row" v-if="preByOrderInfo.preUserRemark"> <view class="order" v-if="preByOrderInfo">
<view class="left"> <view class="row">
预约备注 : <view class="left">
</view> 预约状态 :
<view class="right"> </view>
{{preByOrderInfo.preUserRemark}} <view class="right" v-if="preByOrderInfo.status == 1">
</view> 预约中
</view> </view>
</view> <view class="right" v-if="preByOrderInfo.status == 2">
<view class="width100 height60"></view> 预约成功
</view>
<view class="footer" @click="orderComplete" v-if="preByOrderInfo && preByOrderInfo.status == 2"> <view class="right" v-if="preByOrderInfo.status == 3">
<view class="settlement"> 预约完成
<view class="btn" style="background-color: #0083f5;color: #fff;width: 100% !important;">预约完成</view> </view>
</view> <view class="right" v-if="preByOrderInfo.status == 4">
</view> 预约失败
</view>
<view class="right" v-if="preByOrderInfo.status == 5">
预约取消
</view>
</view>
<view class="row">
<view class="left">
预约订单号 :
</view>
<view class="right">
{{preByOrderInfo.preOrderNo}}
</view>
</view>
<view class="row" v-if="preByOrderInfo.opUserName">
<view class="left">
预约门店 :
</view>
<view class="right">
{{preByOrderInfo.opUserName}}
</view>
</view>
<view class="row" v-if="preByOrderInfo.reachAddress">
<view class="left">
到店地点 :
</view>
<view class="right">
{{preByOrderInfo.reachAddress}}
</view>
</view>
<view class="row" v-if="preByOrderInfo.reachTime">
<view class="left">
到店时间 :
</view>
<view class="right">
{{preByOrderInfo.reachTime | formatDate('-')}}
</view>
</view>
<view class="row" v-if="preByOrderInfo.statusFailDesc">
<view class="left">
预约失败说明 :
</view>
<view class="right">
{{preByOrderInfo.statusFailDesc}}
</view>
</view>
<view class="row" v-if="preByOrderInfo.statusCancelDesc">
<view class="left">
预约取消说明 :
</view>
<view class="right">
{{preByOrderInfo.statusCancelDesc}}
</view>
</view>
<view class="row" v-if="preByOrderInfo.preUserRemark">
<view class="left">
预约备注 :
</view>
<view class="right">
{{preByOrderInfo.preUserRemark}}
</view>
</view>
</view>
<view class="width100 height60"></view>
<view class="footer" @click="orderComplete" v-if="preByOrderInfo && preByOrderInfo.status == 2">
<view class="settlement">
<view class="btn" style="background-color: #0083f5;color: #fff;width: 100% !important;">预约完成</view>
</view>
</view>
<view class="footer" <view class="footer"
v-if="recinfo.orderStatus == 1 && recinfo.highChildOrderList[0].goodsType !=6 && recinfo.highChildOrderList[0].goodsType !=5 && recinfo.highChildOrderList[0].goodsType !=4"> v-if="recinfo.orderStatus == 1 && recinfo.highChildOrderList[0].goodsType !=6 && recinfo.highChildOrderList[0].goodsType !=5 && recinfo.highChildOrderList[0].goodsType !=4">
<view class="settlement"> <view class="settlement">
<view class="sum">合计: <view class="sum">合计:
<view class="money" v-if="recinfo.payType != 3">￥{{recinfo.payPrice}}</view> <view class="money" v-if="recinfo.payType != 3">￥{{recinfo.payPrice}}</view>
<view class="money" v-else> <view class="money" v-else>
<image style="width: 15px;height: 15px;vertical-align: sub;" <image style="width: 15px;height: 15px;vertical-align: sub;" src="../../../static/img/jfx.png">
src="../../../static/img/jfx.png">
</image>{{recinfo.payPrice*100}} </image>{{recinfo.payPrice*100}}
</view> </view>
</view> </view>
@ -312,8 +333,8 @@
<script> <script>
import { import {
getOrderById, getOrderById,
cancelOrder, cancelOrder,
getPreByOrderIdId, getPreByOrderIdId,
orderComplete orderComplete
} from '../../../Utils/Api.js'; } from '../../../Utils/Api.js';
let app = getApp() let app = getApp()
@ -331,14 +352,15 @@
orderId: '', orderId: '',
imageUrl: app.globalData.imgUrl, imageUrl: app.globalData.imgUrl,
imagewxUrl: app.globalData.imageWxImg, imagewxUrl: app.globalData.imageWxImg,
imgadres1: 'dhf.png', imgadres1: 'dhf.png',
preByOrderInfo:'' preByOrderInfo: '',
materialData: '' //实物参数
}; };
}, },
onShow() { onShow() {
//页面显示时，加载订单信息 //页面显示时，加载订单信息
this.getOrderById(); this.getOrderById();
this.getPreByOrderIdId(); this.getPreByOrderIdId();
}, },
onHide() { onHide() {
@ -392,59 +414,62 @@
if (res.return_code == '000000') { if (res.return_code == '000000') {
uni.hideLoading(); uni.hideLoading();
this.recinfo = res.return_data; this.recinfo = res.return_data;
if (res.return_data.remarks) {
this.materialData = JSON.parse(res.return_data.remarks);
}
} else { } else {
uni.hideLoading() uni.hideLoading()
} }
}) })
}, },
//查询预约商品详情 //查询预约商品详情
getPreByOrderIdId() { getPreByOrderIdId() {
let params = { let params = {
orderId: this.orderId, orderId: this.orderId,
} }
getPreByOrderIdId(params).then(res => { getPreByOrderIdId(params).then(res => {
if (res.return_code == '000000') { if (res.return_code == '000000') {
this.preByOrderInfo = res.return_data; this.preByOrderInfo = res.return_data;
} }
}) })
}, },
//预约商品完成 //预约商品完成
orderComplete(){ orderComplete() {
let that = this; let that = this;
uni.showModal({ uni.showModal({
title: '预约完成', title: '预约完成',
content: '确定预约完成？', content: '确定预约完成？',
success: (res) => { success: (res) => {
if (res.confirm) { if (res.confirm) {
uni.showLoading({ uni.showLoading({
title: '加载中...' title: '加载中...'
}) })
let params = { let params = {
preOrderId : this.preByOrderInfo.id preOrderId: this.preByOrderInfo.id
} }
orderComplete(params).then(res => { orderComplete(params).then(res => {
if (res.return_code == '000000') { if (res.return_code == '000000') {
uni.hideLoading(); uni.hideLoading();
uni.showToast({ uni.showToast({
title: res.return_data, title: res.return_data,
icon: 'none', icon: 'none',
duration: 2000 duration: 2000
}) })
this.getPreByOrderIdId(); this.getPreByOrderIdId();
} else { } else {
uni.showToast({ uni.showToast({
title: res.return_msg, title: res.return_msg,
icon: 'none', icon: 'none',
duration: 2000 duration: 2000
}) })
uni.hideLoading() uni.hideLoading()
} }
}) })
} else if (res.cancel) { } else if (res.cancel) {
console.log('用户点击取消'); console.log('用户点击取消');
} }
} }
}); });
}, },
cancelOrder() { cancelOrder() {
let that = this; let that = this;
@ -507,7 +532,8 @@
uni.redirectTo({ uni.redirectTo({
url: "/pages/pay/payment/payment?amount=" + this.recinfo.payPrice + url: "/pages/pay/payment/payment?amount=" + this.recinfo.payPrice +
'&paytype=' + payTypes + '&orderId=' + this.recinfo.id + '&couponId=' + this.recinfo '&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-size: 20px;
font-weight: 600; font-weight: 600;
display: flex; 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>
<!-- 商品主图轮播 --> <!-- 商品主图轮播 -->
<view class="swiper-box"> <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"> <swiper-item v-for="(swiper,index) in swiperList" :key="index">
<image mode="widthFix" :src="imageUrl+swiper" @click="perImage(swiper)"></image> <image mode="widthFix" :src="imageUrl+swiper" @click="perImage(swiper)"></image>
</swiper-item> </swiper-item>

6
subPages/lottery/lottery.vue
Unescape View File

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

Write Preview
Loading…
Cancel
Save