update
This commit is contained in:
ylj20011123
parent
4f1b9bcbe7
commit
1e23557f7b
@ -458,14 +458,16 @@ export default {
|
||||
pageType: "", // spring 春节模式
|
||||
swiperList: [
|
||||
// "https://ahyd.eshangtech.com/UploadImageDir/minprogram/正大泰国榴莲.jpg",
|
||||
"http://saas.eshangtech.com/minTestImg/DragonBoatFestival.jpg",
|
||||
// "http://saas.eshangtech.com/minTestImg/DragonBoatFestival.jpg",
|
||||
"http://saas.eshangtech.com/minTestImg/banner_0605_0612.jpg",
|
||||
"https://ahyd.eshangtech.com/UploadImageDir/minprogram/招商信息_1.jpg",
|
||||
"https://ahyd.eshangtech.com/UploadImageDir/minprogram/龙江大桥_1.jpg",
|
||||
"https://ahyd.eshangtech.com/UploadImageDir/minprogram/小沙坝服务区_1.jpg",
|
||||
],
|
||||
previewImageList: [
|
||||
// "https://ahyd.eshangtech.com/UploadImageDir/minprogram/正大泰国榴莲.jpg",
|
||||
"http://saas.eshangtech.com/minTestImg/DragonBoatFestival.jpg",
|
||||
// "http://saas.eshangtech.com/minTestImg/DragonBoatFestival.jpg",
|
||||
"http://saas.eshangtech.com/minTestImg/banner_0605_0612.jpg",
|
||||
"https://ahyd.eshangtech.com/UploadImageDir/minprogram/正太泰国榴莲.jpg",
|
||||
"https://ahyd.eshangtech.com/UploadImageDir/minprogram/招商信息_1.jpg",
|
||||
"https://ahyd.eshangtech.com/UploadImageDir/minprogram/龙江大桥.jpg",
|
||||
@ -2237,7 +2239,8 @@ export default {
|
||||
background: #fff;
|
||||
border-radius: 32rpx;
|
||||
// background-image: url(https://eshangtech.com/minTestImg/caiyunyiguanggao.jpg);
|
||||
background-image: url(https://ahyd.eshangtech.com/UploadImageDir/minprogram/caiyunyiguanggao_0529_0605.jpg);
|
||||
// background-image: url(https://ahyd.eshangtech.com/UploadImageDir/minprogram/caiyunyiguanggao_0529_0605.jpg);
|
||||
background-image: url(https://eshangtech.com/minTestImg/caiyunyiguanggao_0605_0612.jpg);
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100% 100%;
|
||||
box-sizing: border-box;
|
||||
|
||||
@ -16,11 +16,7 @@
|
||||
自提
|
||||
</div>
|
||||
</div> -->
|
||||
<div
|
||||
class="address"
|
||||
v-if="selectTab === 1"
|
||||
:class="isSubmit ? 'address_submit' : ''"
|
||||
>
|
||||
<div class="address" v-if="selectTab === 1" :class="isSubmit ? 'address_submit' : ''">
|
||||
<div class="address_info">
|
||||
<div class="title">
|
||||
<div class="link_man">
|
||||
@ -30,59 +26,33 @@
|
||||
<div class="mobile">{{ addressInfo.MOBILEPHONE }}</div>
|
||||
</div>
|
||||
<div class="addressBox">
|
||||
<div
|
||||
@click="handleOpenAddress"
|
||||
style="display: flex; align-items: center"
|
||||
>
|
||||
<div @click="handleOpenAddress" style="display: flex; align-items: center">
|
||||
<text class="addressText">选择地址</text>
|
||||
<img
|
||||
class="pickerImg"
|
||||
src="https://eshangtech.com/ShopICO/ahyd-mall/editIcon.svg"
|
||||
/>
|
||||
<img class="pickerImg" src="https://eshangtech.com/ShopICO/ahyd-mall/editIcon.svg" />
|
||||
</div>
|
||||
<div class="address_text">
|
||||
{{ addressInfo.ADDRESS || "" }}{{ addressInfo.DOORPLATE || "" }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<img
|
||||
src="/static/images/home/addressShopCar.png"
|
||||
alt=""
|
||||
class="addrss_bg"
|
||||
/>
|
||||
<img src="/static/images/home/addressShopCar.png" alt="" class="addrss_bg" />
|
||||
</div>
|
||||
|
||||
<div class="selfPickup" v-if="selectTab === 2">
|
||||
<div class="pickupBox">
|
||||
<div class="label">预留电话</div>
|
||||
<Input
|
||||
class="value"
|
||||
v-model="phoneNumber"
|
||||
:maxlength="11"
|
||||
type="number"
|
||||
/>
|
||||
<Input class="value" v-model="phoneNumber" :maxlength="11" type="number" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="commodity margin_auto">
|
||||
<CommodityItem
|
||||
:isSubmit="isSubmit"
|
||||
:obj="item"
|
||||
v-for="(item, index) in shopOrder.slice(0, 5)"
|
||||
:key="index"
|
||||
/>
|
||||
<CommodityItem :isSubmit="isSubmit" :obj="item" v-for="(item, index) in shopOrder.slice(0, 5)" :key="index" />
|
||||
<div class="is_more" @click="isShowMore = !isShowMore">
|
||||
<img
|
||||
v-if="shopOrder.length > 5"
|
||||
:src="
|
||||
isShowMore
|
||||
? '/static/images/home/up_arrow.png'
|
||||
: '/static/images/home/down_arrow.png'
|
||||
"
|
||||
alt=""
|
||||
class="arrow_icon"
|
||||
/>
|
||||
<img v-if="shopOrder.length > 5" :src="isShowMore
|
||||
? '/static/images/home/up_arrow.png'
|
||||
: '/static/images/home/down_arrow.png'
|
||||
" alt="" class="arrow_icon" />
|
||||
共{{ shopOrder.length }}个品项，{{ shopCount }}件商品
|
||||
</div>
|
||||
</div>
|
||||
@ -132,26 +102,17 @@
|
||||
<div class="place_order">
|
||||
<div class="place_order_box" v-if="!isSubmit">
|
||||
<div class="sum_count">
|
||||
合计<span class="unit">￥</span
|
||||
><span class="price">{{ couponOrder }}</span>
|
||||
合计<span class="unit">￥</span><span class="price">{{ couponOrder }}</span>
|
||||
</div>
|
||||
|
||||
<div
|
||||
v-if="pageType === 'UnionMall' && payType === 1"
|
||||
class="place_order_btn"
|
||||
@click="handleCombinationPayment"
|
||||
>
|
||||
<div v-if="pageType === 'UnionMall' && payType === 1" class="place_order_btn" @click="handleCombinationPayment">
|
||||
组合支付
|
||||
</div>
|
||||
|
||||
<div
|
||||
v-if="
|
||||
(pageType === 'UnionMall' && payType === 0) ||
|
||||
pageType !== 'UnionMall'
|
||||
"
|
||||
class="place_order_btn"
|
||||
@click="createOrder"
|
||||
>
|
||||
<div v-if="
|
||||
(pageType === 'UnionMall' && payType === 0) ||
|
||||
pageType !== 'UnionMall'
|
||||
" class="place_order_btn" @click="createOrder">
|
||||
立即下单
|
||||
</div>
|
||||
</div>
|
||||
@ -159,11 +120,7 @@
|
||||
</div>
|
||||
|
||||
<div v-if="datePicker" class="dataTimeSelect">
|
||||
<date-time
|
||||
:show="datePicker"
|
||||
@change="handleTimeChange"
|
||||
:currentDate="currentDate"
|
||||
></date-time>
|
||||
<date-time :show="datePicker" @change="handleTimeChange" :currentDate="currentDate"></date-time>
|
||||
</div>
|
||||
<loading v-if="isShowLoading"></loading>
|
||||
<div v-if="isShowLoading" class="meng"></div>
|
||||
@ -173,30 +130,15 @@
|
||||
<view class="addressPopupBox">
|
||||
<view class="addressPopupTitle">选择收货地址</view>
|
||||
<view class="addressList">
|
||||
<view
|
||||
class="addressItem"
|
||||
v-for="(item, index) in addressList"
|
||||
:key="index"
|
||||
>
|
||||
<view class="addressItem" v-for="(item, index) in addressList" :key="index">
|
||||
<view class="addressItemTop">
|
||||
<view class="itemTopLeft">
|
||||
<radio
|
||||
:checked="item.MEMBERADDRESS_ID === selectAddressId"
|
||||
color="#1890FF"
|
||||
@click="handleChangeAddress(item.MEMBERADDRESS_ID)"
|
||||
></radio>
|
||||
<text class="addressText"
|
||||
>{{ item.ADDRESS || "" }}{{ item.DOORPLATE || "" }}</text
|
||||
>
|
||||
<radio :checked="item.MEMBERADDRESS_ID === selectAddressId" color="#1890FF"
|
||||
@click="handleChangeAddress(item.MEMBERADDRESS_ID)"></radio>
|
||||
<text class="addressText">{{ item.ADDRESS || "" }}{{ item.DOORPLATE || "" }}</text>
|
||||
</view>
|
||||
<view
|
||||
class="itemTopRight"
|
||||
@click="checkOrEdit(item.MEMBERADDRESS_ID)"
|
||||
>
|
||||
<img
|
||||
class="pickerImg"
|
||||
src="https://eshangtech.com/ShopICO/ahyd-mall/editIcon.svg"
|
||||
/>
|
||||
<view class="itemTopRight" @click="checkOrEdit(item.MEMBERADDRESS_ID)">
|
||||
<img class="pickerImg" src="https://eshangtech.com/ShopICO/ahyd-mall/editIcon.svg" />
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@ -212,9 +154,7 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<navigator url="/pages/myAddress/newAdd/index" class="btn"
|
||||
>新增收货地址</navigator
|
||||
>
|
||||
<navigator url="/pages/myAddress/newAdd/index" class="btn">新增收货地址</navigator>
|
||||
</view>
|
||||
</uni-popup>
|
||||
</div>
|
||||
@ -297,7 +237,7 @@ export default {
|
||||
this.handleGetAddressList();
|
||||
}
|
||||
},
|
||||
onUnload() {},
|
||||
onUnload() { },
|
||||
async onLoad(option) {
|
||||
const app = getApp();
|
||||
|
||||
@ -346,7 +286,7 @@ export default {
|
||||
this.payType = Number(e.detail.value);
|
||||
},
|
||||
// 组合支付
|
||||
handleCombinationPayment() {},
|
||||
handleCombinationPayment() { },
|
||||
// 切换tab
|
||||
handleChangeTab(value) {
|
||||
this.selectTab = value;
|
||||
@ -506,8 +446,8 @@ export default {
|
||||
DATAFORMATType === 2
|
||||
? "3002"
|
||||
: this.pageType === "UnionMall"
|
||||
? "3001"
|
||||
: "3000",
|
||||
? "3001"
|
||||
: "3000",
|
||||
provinceCode: this.user.PROVINCE_CODE || "530000",
|
||||
serverpartShopId: "5634",
|
||||
takeType: this.selectTab === 1 ? 2000 : this.selectTab === 2 ? 1000 : 0, // 1000 自提 邮寄
|
||||
@ -634,7 +574,7 @@ export default {
|
||||
uni.showModal({
|
||||
title: "提示",
|
||||
content: `${pingnuoData.data.description}`,
|
||||
success: function (res) {},
|
||||
success: function (res) { },
|
||||
});
|
||||
this.isMakeOrdering = false;
|
||||
}
|
||||
@ -647,7 +587,7 @@ export default {
|
||||
uni.showModal({
|
||||
title: "提示",
|
||||
content: data.ResultDesc,
|
||||
success: function (res) {},
|
||||
success: function (res) { },
|
||||
});
|
||||
this.isMakeOrdering = false;
|
||||
}
|
||||
@ -751,6 +691,8 @@ export default {
|
||||
// payMoney 工会之家订单 组合支付时可能会出现的值
|
||||
let _this = this;
|
||||
console.log("_this.couponOrder", _this.couponOrder);
|
||||
console.log("payMoneypayMoneypayMoney", payMoney);
|
||||
console.log("objobjobjobjobjobjobjobj", obj);
|
||||
// 拿到签名
|
||||
let mchid = "1672298991";
|
||||
let timeStamp = Math.ceil(new Date().getTime() / 1000);
|
||||
@ -767,7 +709,10 @@ export default {
|
||||
notify_url:
|
||||
"https://mp.eshangtech.com/Coop.Merchant/Handler/Handler_Trade.ashx", // 商户回调地址
|
||||
amount: {
|
||||
total: payMoney ? payMoney * 100 : Number(obj.PAY_AMOUNT) * 100 || 1,
|
||||
// total: payMoney ? payMoney * 100 : Number(obj.PAY_AMOUNT) * 100 || 1,
|
||||
total: payMoney
|
||||
? Math.round(payMoney * 100)
|
||||
: Math.round(parseFloat(obj.PAY_AMOUNT) * 100) || 1,
|
||||
currency: "CNY",
|
||||
}, // 订单金额
|
||||
payer: {
|
||||
@ -888,7 +833,7 @@ export default {
|
||||
if (res.errMsg === "requestPayment:fail cancel") {
|
||||
}
|
||||
},
|
||||
complete(res) {},
|
||||
complete(res) { },
|
||||
});
|
||||
} else {
|
||||
uni.showToast({
|
||||
@ -949,6 +894,7 @@ export default {
|
||||
box-sizing: border-box;
|
||||
position: relative;
|
||||
padding-bottom: 196rpx;
|
||||
|
||||
.topBox {
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
@ -967,6 +913,7 @@ export default {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
overflow: hidden;
|
||||
|
||||
.tabItem {
|
||||
width: 50%;
|
||||
height: 108rpx;
|
||||
@ -974,6 +921,7 @@ export default {
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.seleTabItem {
|
||||
background-image: url("https://eshangtech.com/minTestImg/leftTabSelect.png");
|
||||
background-repeat: no-repeat;
|
||||
@ -1094,15 +1042,18 @@ export default {
|
||||
background: #fefffe;
|
||||
box-sizing: border-box;
|
||||
padding: 24rpx;
|
||||
|
||||
.pickupBox {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
|
||||
.label {
|
||||
font-size: 28rpx;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.value {
|
||||
font-size: 28rpx;
|
||||
font-weight: 600;
|
||||
@ -1384,19 +1335,23 @@ export default {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
|
||||
.label {
|
||||
font-size: 14px;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.selectBox {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
.pickerBox {
|
||||
font-size: 28rpx;
|
||||
font-family: "PingFang SC";
|
||||
line-height: 34rpx;
|
||||
color: #9fa3a8;
|
||||
}
|
||||
|
||||
.rightIcon {
|
||||
width: 18rpx;
|
||||
height: 18rpx;
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1,4 +1,4 @@
|
||||
{
|
||||
"usingComponents": {},
|
||||
"component": true
|
||||
"component": true,
|
||||
"usingComponents": {}
|
||||
}
|
||||
@ -320,10 +320,12 @@ var _default = {
|
||||
// spring 春节模式
|
||||
swiperList: [
|
||||
// "https://ahyd.eshangtech.com/UploadImageDir/minprogram/正大泰国榴莲.jpg",
|
||||
"http://saas.eshangtech.com/minTestImg/DragonBoatFestival.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/招商信息_1.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/龙江大桥_1.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/小沙坝服务区_1.jpg"],
|
||||
// "http://saas.eshangtech.com/minTestImg/DragonBoatFestival.jpg",
|
||||
"http://saas.eshangtech.com/minTestImg/banner_0605_0612.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/招商信息_1.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/龙江大桥_1.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/小沙坝服务区_1.jpg"],
|
||||
previewImageList: [
|
||||
// "https://ahyd.eshangtech.com/UploadImageDir/minprogram/正大泰国榴莲.jpg",
|
||||
"http://saas.eshangtech.com/minTestImg/DragonBoatFestival.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/正太泰国榴莲.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/招商信息_1.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/龙江大桥.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/小沙坝服务区.jpg"],
|
||||
// "http://saas.eshangtech.com/minTestImg/DragonBoatFestival.jpg",
|
||||
"http://saas.eshangtech.com/minTestImg/banner_0605_0612.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/正太泰国榴莲.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/招商信息_1.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/龙江大桥.jpg", "https://ahyd.eshangtech.com/UploadImageDir/minprogram/小沙坝服务区.jpg"],
|
||||
// 预览图数组
|
||||
roadStatusList: [],
|
||||
// 路况播报
|
||||
|
||||
@ -618,7 +618,7 @@
|
||||
height: calc(2688 * 70vw / 1242);
|
||||
background: #fff;
|
||||
border-radius: 32rpx;
|
||||
background-image: url(https://ahyd.eshangtech.com/UploadImageDir/minprogram/caiyunyiguanggao_0529_0605.jpg);
|
||||
background-image: url(https://eshangtech.com/minTestImg/caiyunyiguanggao_0605_0612.jpg);
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100% 100%;
|
||||
box-sizing: border-box;
|
||||
|
||||
@ -828,6 +828,8 @@ var _default = {
|
||||
// payMoney 工会之家订单 组合支付时可能会出现的值
|
||||
_this = _this7;
|
||||
console.log("_this.couponOrder", _this.couponOrder);
|
||||
console.log("payMoneypayMoneypayMoney", payMoney);
|
||||
console.log("objobjobjobjobjobjobjobj", obj);
|
||||
// 拿到签名
|
||||
mchid = "1672298991";
|
||||
timeStamp = Math.ceil(new Date().getTime() / 1000);
|
||||
@ -846,7 +848,8 @@ var _default = {
|
||||
notify_url: "https://mp.eshangtech.com/Coop.Merchant/Handler/Handler_Trade.ashx",
|
||||
// 商户回调地址
|
||||
amount: {
|
||||
total: payMoney ? payMoney * 100 : Number(obj.PAY_AMOUNT) * 100 || 1,
|
||||
// total: payMoney ? payMoney * 100 : Number(obj.PAY_AMOUNT) * 100 || 1,
|
||||
total: payMoney ? Math.round(payMoney * 100) : Math.round(parseFloat(obj.PAY_AMOUNT) * 100) || 1,
|
||||
currency: "CNY"
|
||||
},
|
||||
// 订单金额
|
||||
@ -860,9 +863,9 @@ var _default = {
|
||||
parameters: "POST\n/v3/pay/transactions/jsapi\n" + timeStamp + "\n" + nonceStr + "\n" + JSON.stringify(req) + "\n",
|
||||
provinceCode: _this.provinceCode || "530000"
|
||||
};
|
||||
_context6.next = 12;
|
||||
_context6.next = 14;
|
||||
return _this7.$api.$get("/WeChat/GenerateSign", reqSign);
|
||||
case 12:
|
||||
case 14:
|
||||
data = _context6.sent;
|
||||
console.log("data3213123", data.Result_Data);
|
||||
Authorization = "mchid=\"".concat(mchid, "\",nonce_str=\"").concat(nonceStr, "\",signature=\"").concat(data.Result_Data, "\",timestamp=\"").concat(timeStamp, "\",serial_no=\"").concat(serial_no, "\"");
|
||||
@ -931,7 +934,7 @@ var _default = {
|
||||
}()
|
||||
});
|
||||
return _context6.abrupt("return");
|
||||
case 21:
|
||||
case 23:
|
||||
case "end":
|
||||
return _context6.stop();
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user