update
This commit is contained in:
ylj20011123
parent
28003572dd
commit
ab29560355
@ -1,28 +1,28 @@
|
||||
{
|
||||
"name": "caiyunyi",
|
||||
"appid": "__UNI__DCA4425",
|
||||
"description": "",
|
||||
"versionName": "1.0.0",
|
||||
"versionCode": "100",
|
||||
"transformPx": false,
|
||||
"app-plus": {
|
||||
"name" : "caiyunyi",
|
||||
"appid" : "__UNI__DCA4425",
|
||||
"description" : "",
|
||||
"versionName" : "1.0.0",
|
||||
"versionCode" : "100",
|
||||
"transformPx" : false,
|
||||
"app-plus" : {
|
||||
/* 5+App特有相关 */
|
||||
"usingComponents": true,
|
||||
"nvueCompiler": "uni-app",
|
||||
"nvueStyleCompiler": "uni-app",
|
||||
"splashscreen": {
|
||||
"alwaysShowBeforeRender": true,
|
||||
"waiting": true,
|
||||
"autoclose": true,
|
||||
"delay": 0
|
||||
"usingComponents" : true,
|
||||
"nvueCompiler" : "uni-app",
|
||||
"nvueStyleCompiler" : "uni-app",
|
||||
"splashscreen" : {
|
||||
"alwaysShowBeforeRender" : true,
|
||||
"waiting" : true,
|
||||
"autoclose" : true,
|
||||
"delay" : 0
|
||||
},
|
||||
"modules": {},
|
||||
"modules" : {},
|
||||
/* 模块配置 */
|
||||
"distribute": {
|
||||
"distribute" : {
|
||||
/* 应用发布信息 */
|
||||
"android": {
|
||||
"android" : {
|
||||
/* android打包配置 */
|
||||
"permissions": [
|
||||
"permissions" : [
|
||||
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
|
||||
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
|
||||
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
|
||||
@ -40,28 +40,30 @@
|
||||
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
|
||||
]
|
||||
},
|
||||
"ios": {},
|
||||
"ios" : {
|
||||
"dSYMs" : false
|
||||
},
|
||||
/* ios打包配置 */
|
||||
"sdkConfigs": {}
|
||||
"sdkConfigs" : {}
|
||||
}
|
||||
},
|
||||
/* SDK配置 */
|
||||
"quickapp": {},
|
||||
"quickapp" : {},
|
||||
/* 快应用特有相关 */
|
||||
"mp-weixin": {
|
||||
"mp-weixin" : {
|
||||
/* 小程序特有相关 */
|
||||
"appid": "wxee018fb96955552a",
|
||||
"setting": {
|
||||
"urlCheck": false
|
||||
"appid" : "wxee018fb96955552a",
|
||||
"setting" : {
|
||||
"urlCheck" : false
|
||||
},
|
||||
"usingComponents": true,
|
||||
"requiredPrivateInfos": ["getLocation", "chooseAddress"],
|
||||
"__usePrivacyCheck__": true,
|
||||
"permission": {
|
||||
"scope.userLocation": {
|
||||
"desc": "获取位置信息用于展示"
|
||||
"usingComponents" : true,
|
||||
"requiredPrivateInfos" : [ "getLocation", "chooseAddress" ],
|
||||
"__usePrivacyCheck__" : true,
|
||||
"permission" : {
|
||||
"scope.userLocation" : {
|
||||
"desc" : "获取位置信息用于展示"
|
||||
}
|
||||
}
|
||||
},
|
||||
"vueVersion": "2"
|
||||
}
|
||||
"vueVersion" : "2"
|
||||
}
|
||||
|
||||
@ -711,7 +711,16 @@ export default {
|
||||
let list = [];
|
||||
this.shopList.forEach((item) => {
|
||||
if (item.COMMODITY_CODE !== obj.COMMODITY_CODE) {
|
||||
list.push(item);
|
||||
if(obj.RTCOMMODITY_MULTI_ID){
|
||||
// 规格都一样 说明确实是同一个了 可以删除
|
||||
if(item.RTCOMMODITY_MULTI_ID === obj.RTCOMMODITY_MULTI_ID){
|
||||
|
||||
}else{
|
||||
list.push(item);
|
||||
}
|
||||
}else{
|
||||
list.push(item);
|
||||
}
|
||||
}
|
||||
});
|
||||
this.shopList = list;
|
||||
|
||||
@ -95,14 +95,20 @@
|
||||
|
||||
<!-- 右侧商品详情 -->
|
||||
<div class="shopDetailList" v-if="changBigTypeLoading">
|
||||
<scroll-view class="shopDetailScroll" scroll-y :scroll-top="topNum" :scroll-into-view="toView"
|
||||
scroll-with-animation="true">
|
||||
<!-- @scroll="getIndexFromHArr" -->
|
||||
<template v-if="rightShopList && rightShopList.length > 0">
|
||||
<div class="shopDetailItem" style="height: 104px" v-for="(item, index) in rightShopList" :key="index"
|
||||
@click="showDetail(item)">
|
||||
<scroll-view class="shopDetailScroll" scroll-y :scroll-top="topNum" @scroll="onVirtualScroll" :style="{
|
||||
height: `calc(100vh - 50px - ${safeHeight}px - ${menu.top + 32 + 32 + 12 + 12 + 23 + 95}px)`
|
||||
}">
|
||||
<!-- :style="{ height: virtualListHeight + 'px' }" -->
|
||||
<div :style="{ height: totalHeight + 'px', position: 'relative' }">
|
||||
<div v-for="(item, i) in visibleList" :key="item.COMMODITY_ID" class="shopDetailItem" :style="{
|
||||
height: itemHeight + 'px',
|
||||
position: 'absolute',
|
||||
top: (startIndex + i) * itemHeight + 'px',
|
||||
width: '100%'
|
||||
}" @click="showDetail(item)">
|
||||
<image class="leftImg" style="width: 80px; height: 80px"
|
||||
:src="item.IMAGE_PATH || '/static/images/home/defultImg.png'" :lazy-load="true" />
|
||||
:src="item.IMAGE_PATH || '/static/images/home/defultImg.png'" :lazy-load="true"
|
||||
@error="e => e.target.src = '/static/images/home/defultImg.png'" :key="item.COMMODITY_ID" />
|
||||
<div class="rightBox">
|
||||
<p class="detailTitle">{{ item.COMMODITY_NAME }}</p>
|
||||
<div class="bottom">
|
||||
@ -120,7 +126,6 @@
|
||||
item.count
|
||||
}}</text>
|
||||
</div>
|
||||
|
||||
<div class="addReduceBox" v-else>
|
||||
<div class="reduceShopCar" @click.stop="touchReduce($event, item)" v-if="item.showReduce">
|
||||
<img class="optionBtn" src="/static/images/home/reduce.svg" />
|
||||
@ -139,8 +144,8 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
<div class="noDataBox" v-else>
|
||||
</div>
|
||||
<div class="noDataBox" v-if="!rightShopList || rightShopList.length === 0">
|
||||
<no-data text="暂无商品" />
|
||||
</div>
|
||||
</scroll-view>
|
||||
@ -150,7 +155,7 @@
|
||||
|
||||
<uni-popup ref="shopPopup" :safe-area="false">
|
||||
<view class="shopPopupBox">
|
||||
<view class="shopPopupContent">
|
||||
<div class="shopPopupContent">
|
||||
<div class="detailTop">
|
||||
<image class="detailImg" :src="good.DEFAULT_IMG || '/static/images/home/defultImg.png'" />
|
||||
<div class="box">
|
||||
@ -166,52 +171,60 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="detailMessage">
|
||||
<p class="detailTitle">详细信息</p>
|
||||
<text class="detailText"></text>
|
||||
</div>
|
||||
<div class="orderDetail">
|
||||
<p class="orderTitle">下单信息</p>
|
||||
<div class="numBox">
|
||||
<text class="numTitle">购买数量</text>
|
||||
<div class="cartcontrol">
|
||||
<div class="subtract" @click="handleDetailSubtract($event, good)">
|
||||
<image class="img" src="/static/images/home/subtract.svg"></image>
|
||||
</div>
|
||||
<input class="cart-count" confirm-type="done" type="digit" :maxlength="inputMaxLength"
|
||||
style="background: #fff; text-align: center; width: 100px" placeholder="0" :value="good.count"
|
||||
@input="handleNumber" />
|
||||
<div class="subtract" @click="handleDetailAdd($event, good)">
|
||||
<image class="img" src="/static/images/home/addIcon.svg"></image>
|
||||
<scroll-view :scroll-y="true" class="scrollDetailBox">
|
||||
<div class="detailMessage">
|
||||
<p class="detailTitle">详细信息</p>
|
||||
<text class="detailText"></text>
|
||||
</div>
|
||||
<div class="orderDetail">
|
||||
<p class="orderTitle">下单信息</p>
|
||||
<div class="numBox">
|
||||
<text class="numTitle">购买数量</text>
|
||||
<div class="cartcontrol">
|
||||
<div class="subtract" @click="handleDetailSubtract($event, good)">
|
||||
<image class="img" src="/static/images/home/subtract.svg"></image>
|
||||
</div>
|
||||
<input class="cart-count" confirm-type="done" type="digit" :maxlength="inputMaxLength"
|
||||
style="background: #fff; text-align: center; width: 100px" placeholder="0" :value="good.count"
|
||||
@input="handleNumber" />
|
||||
<div class="subtract" @click="handleDetailAdd($event, good)">
|
||||
<image class="img" src="/static/images/home/addIcon.svg"></image>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="sizeBox">
|
||||
<div class="sizeTitle">规格</div>
|
||||
<div class="sizeList">
|
||||
<div :class="good.COMMODITY_RULE === item.COMMODITY_MULTI_ID
|
||||
? 'sizeItem selectSizeItem'
|
||||
: 'sizeItem'
|
||||
" v-for="(item, index) in good.SKULIST" :key="index"
|
||||
@click="handleChangeSelectSKULIST(item.COMMODITY_MULTI_ID)">
|
||||
{{ item.COMMODITY_NAME }}
|
||||
</div>
|
||||
<!-- <div class="sizeItem">{{ good.COMMODITY_UNIT }}</div> -->
|
||||
<div class="sizeBox">
|
||||
<div class="sizeTitle">规格</div>
|
||||
<scroll-view :scroll-x="true" :scroll-y="true" class="sizeScrollBox">
|
||||
<div class="sizeList">
|
||||
<div :class="good.RTCOMMODITY_MULTI_ID === item.COMMODITY_MULTI_ID
|
||||
? 'sizeItem selectSizeItem'
|
||||
: 'sizeItem'
|
||||
" :style="{
|
||||
background: item.COMMODITY_STOCK > 0 ? good.RTCOMMODITY_MULTI_ID === item.COMMODITY_MULTI_ID ? '#e7f3ff' : '#dbdad6' : '#9c9c9a0',
|
||||
color: item.COMMODITY_STOCK > 0 ? good.RTCOMMODITY_MULTI_ID === item.COMMODITY_MULTI_ID ? '#1890ff' : '#000' : '#a4a4a4'
|
||||
}" v-for="(item, index) in good.SKULIST" :key="index"
|
||||
@click="handleChangeSelectSKULIST(item.COMMODITY_MULTI_ID, item)">
|
||||
{{ item.COMMODITY_NAME }}
|
||||
</div>
|
||||
<!-- <div class="sizeItem">{{ good.COMMODITY_UNIT }}</div> -->
|
||||
</div>
|
||||
</scroll-view>
|
||||
</div>
|
||||
<div class="descBox">
|
||||
<input class="desc" :value="good.SALEDETAIL_DESC" placeholder="请填写商品备注"
|
||||
@input="handleDesc($event, good)" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="descBox">
|
||||
<input class="desc" :value="good.SALEDETAIL_DESC" placeholder="请填写商品备注"
|
||||
@input="handleDesc($event, good)" />
|
||||
</div>
|
||||
|
||||
<view class="rightBtn">
|
||||
<div class="addCarBtn" @click="handleShowShopPopup">
|
||||
加入购物车
|
||||
</div>
|
||||
</view>
|
||||
</div>
|
||||
</view>
|
||||
<view class="rightBtn">
|
||||
<div class="addCarBtn" @click="handleShowShopPopup">
|
||||
加入购物车
|
||||
</div>
|
||||
</view>
|
||||
</div>
|
||||
</scroll-view>
|
||||
|
||||
</div>
|
||||
|
||||
<!-- <view class="bottomBtn">
|
||||
<view
|
||||
@ -260,6 +273,15 @@ export default {
|
||||
good: {}, // 悬浮框里面 选择规格的商品详情
|
||||
systemInfo: {},
|
||||
safeHeight: 0,
|
||||
|
||||
|
||||
itemHeight: 104, // 单个商品高度(px)
|
||||
virtualListHeight: 520, // 可视区高度(px)，比如显示5个
|
||||
startIndex: 0,
|
||||
endIndex: 0,
|
||||
buffer: 30, // 前后缓冲区
|
||||
visibleList: [],
|
||||
totalHeight: 0,
|
||||
};
|
||||
},
|
||||
watch: {
|
||||
@ -279,6 +301,15 @@ export default {
|
||||
},
|
||||
deep: true,
|
||||
},
|
||||
rightShopList: {
|
||||
handler(val) {
|
||||
this.totalHeight = val.length * this.itemHeight;
|
||||
this.startIndex = 0;
|
||||
this.endIndex = Math.min(val.length, Math.ceil(this.virtualListHeight / this.itemHeight) + this.buffer * 2);
|
||||
this.updateVisibleList();
|
||||
},
|
||||
immediate: true
|
||||
},
|
||||
},
|
||||
computed: {
|
||||
...mapGetters({
|
||||
@ -322,7 +353,7 @@ export default {
|
||||
// 拿到全部的商品
|
||||
// this.handleGetAllShopItem();
|
||||
}
|
||||
|
||||
this.onVirtualScroll = this.throttle(this.onVirtualScroll, 100); //
|
||||
this.$utils.addUserBehaviorNew();
|
||||
},
|
||||
onShow() {
|
||||
@ -403,6 +434,32 @@ export default {
|
||||
this.searchText = "";
|
||||
},
|
||||
methods: {
|
||||
// 节流函数
|
||||
throttle(fn, delay) {
|
||||
let last = 0;
|
||||
return function (...args) {
|
||||
const now = Date.now();
|
||||
if (now - last > delay) {
|
||||
last = now;
|
||||
fn.apply(this, args);
|
||||
}
|
||||
};
|
||||
},
|
||||
|
||||
onVirtualScroll(e) {
|
||||
const scrollTop = e.detail.scrollTop;
|
||||
const start = Math.floor(scrollTop / this.itemHeight);
|
||||
this.startIndex = Math.max(0, start - this.buffer);
|
||||
// 这里要保证 endIndex 不会超过 rightShopList.length
|
||||
this.endIndex = Math.min(
|
||||
this.rightShopList.length,
|
||||
this.startIndex + Math.ceil(this.virtualListHeight / this.itemHeight) + this.buffer * 2
|
||||
);
|
||||
this.updateVisibleList();
|
||||
},
|
||||
updateVisibleList() {
|
||||
this.visibleList = this.rightShopList.slice(this.startIndex, this.endIndex);
|
||||
},
|
||||
// 打开购物车 或 立即购买的悬浮框 1 打开购物车 2 立即购买 3售罄
|
||||
handleShowShopPopup() {
|
||||
if (!this.user.MEMBERSHIP_ID) {
|
||||
@ -419,7 +476,7 @@ export default {
|
||||
}
|
||||
|
||||
console.log("good", this.good);
|
||||
if (this.good.COMMODITY_RULE === "默认" || !this.good.COMMODITY_RULE) {
|
||||
if (this.good.RTCOMMODITY_MULTI_ID === "默认" || !this.good.RTCOMMODITY_MULTI_ID) {
|
||||
uni.showToast({
|
||||
title: "请先选择规格！",
|
||||
icon: "none",
|
||||
@ -440,8 +497,28 @@ export default {
|
||||
);
|
||||
if (filterList && filterList.length > 0) {
|
||||
list.forEach((item) => {
|
||||
if (item.COMMODITY_ID === this.good.COMMODITY_ID) {
|
||||
item.count = this.good.count;
|
||||
// 先看看有没有规格id 如果选了规格 不一样规格 算不同的商品
|
||||
if (this.good.RTCOMMODITY_MULTI_ID) {
|
||||
let filterRuleList = list.filter(
|
||||
(item) => item.RTCOMMODITY_MULTI_ID === this.good.RTCOMMODITY_MULTI_ID
|
||||
);
|
||||
// 如果有一样规格的 就替换值 没有 就等于新增商品
|
||||
if (filterRuleList && filterRuleList.length > 0) {
|
||||
if (item.COMMODITY_ID === this.good.COMMODITY_ID) {
|
||||
item.count = this.good.count;
|
||||
}
|
||||
} else {
|
||||
list.push({ ...this.good });
|
||||
nowShopList.forEach((item) => {
|
||||
if (item.COMMODITY_ID === this.good.COMMODITY_ID) {
|
||||
item.count = this.good.count;
|
||||
}
|
||||
});
|
||||
}
|
||||
} else {
|
||||
if (item.COMMODITY_ID === this.good.COMMODITY_ID) {
|
||||
item.count = this.good.count;
|
||||
}
|
||||
}
|
||||
});
|
||||
nowShopList.forEach((item) => {
|
||||
@ -549,7 +626,7 @@ export default {
|
||||
// excludeNature: this.pageType === "UnionMall" ? "" : 5070,
|
||||
// commodityNature: this.pageType === "UnionMall" ? 5070 : "",
|
||||
// payMethod: "1000,3000",
|
||||
// justCommodity: 1,
|
||||
// // justCommodity: 1,
|
||||
// });
|
||||
|
||||
const data = await this.$api.$javaGet(
|
||||
@ -558,13 +635,15 @@ export default {
|
||||
ownerUnitId: 911,
|
||||
appId: "wxee018fb96955552a",
|
||||
commodityName: this.searchText,
|
||||
excludeNature: this.pageType === "UnionMall" ? "" : 5070,
|
||||
commodityNature: this.pageType === "UnionMall" ? 5070 : "",
|
||||
excludeNature: this.pageType === "UnionMall" ? null : 5070,
|
||||
commodityNature: this.pageType === "UnionMall" ? 5070 : null,
|
||||
payMethod: "1000,3000",
|
||||
justCommodity: 1,
|
||||
// justCommodity: 1,
|
||||
}
|
||||
)
|
||||
|
||||
uni.hideLoading()
|
||||
|
||||
let list = data.Data.List;
|
||||
console.log("list", list);
|
||||
let shopList = [];
|
||||
@ -614,8 +693,19 @@ export default {
|
||||
});
|
||||
}
|
||||
console.log("搜索商品", shopList);
|
||||
this.rightShopList = shopList;
|
||||
uni.hideLoading();
|
||||
|
||||
// 再去一下重 因为单个商品 多类别
|
||||
let res = []
|
||||
let shopIdList = []
|
||||
if (shopList && shopList.length > 0) {
|
||||
shopList.forEach((item) => {
|
||||
if (shopIdList.indexOf(item.COMMODITY_ID) === -1) {
|
||||
res.push(item)
|
||||
shopIdList.push(item.COMMODITY_ID)
|
||||
}
|
||||
})
|
||||
}
|
||||
this.rightShopList = res;
|
||||
} else {
|
||||
if (this.pageType === "UnionMall") {
|
||||
// 工会之家拿到的商品类型
|
||||
@ -695,7 +785,7 @@ export default {
|
||||
// commodityName: this.searchText,
|
||||
// excludeNature: this.pageType === "UnionMall" ? "" : 5070,
|
||||
// commodityNature: this.pageType === "UnionMall" ? 5070 : "",
|
||||
// justCommodity: 1,
|
||||
// // justCommodity: 1,
|
||||
// });
|
||||
|
||||
const data = await this.$api.$javaGet(
|
||||
@ -703,13 +793,14 @@ export default {
|
||||
{
|
||||
ownerUnitId: 911,
|
||||
userdefinedTypeId: this.searchText ? "" : id,
|
||||
userdefinedtypeId: this.searchText ? "" : id,
|
||||
commodityName: this.searchText,
|
||||
excludeNature: this.pageType === "UnionMall" ? "" : 5070,
|
||||
commodityNature: this.pageType === "UnionMall" ? 5070 : "",
|
||||
justCommodity: 1,
|
||||
// justCommodity: 1,
|
||||
}
|
||||
)
|
||||
|
||||
uni.hideLoading()
|
||||
let list = data.Data.List;
|
||||
console.log("拿到全部的商品", list);
|
||||
let thisAllType = [];
|
||||
@ -774,6 +865,8 @@ export default {
|
||||
console.log("list[leftIndex]", list[leftIndex]);
|
||||
// 这一大类的全部商品
|
||||
let thisTypeAllShop = [];
|
||||
// 当前的全部商品id
|
||||
let allShopID = []
|
||||
|
||||
list.forEach((item) => {
|
||||
if (item.UserdefinedType_Name !== "全部") {
|
||||
@ -784,7 +877,10 @@ export default {
|
||||
item.USERDEFINEDTYPE_ID === id)
|
||||
) {
|
||||
item.COMMODITYLIST.forEach((subItem) => {
|
||||
thisTypeAllShop.push(subItem);
|
||||
if (allShopID.indexOf(subItem.COMMODITY_ID) === -1) {
|
||||
thisTypeAllShop.push(subItem);
|
||||
allShopID.push(subItem.COMMODITY_ID)
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@ -913,7 +1009,7 @@ export default {
|
||||
|
||||
console.log("现在的小类", this.leftTypeList);
|
||||
|
||||
uni.hideLoading();
|
||||
uni.hideLoading()
|
||||
},
|
||||
// 商品列表
|
||||
showDetail(obj) {
|
||||
@ -1085,13 +1181,20 @@ export default {
|
||||
} else {
|
||||
currentShop.count = 1;
|
||||
}
|
||||
currentShop.SKULIST[0].COMMODITY_STOCK = 0
|
||||
this.good = currentShop;
|
||||
console.log("this.good", this.good);
|
||||
this.$refs.shopPopup.open("bottom");
|
||||
},
|
||||
// 改变当前选中的规格
|
||||
handleChangeSelectSKULIST(value) {
|
||||
this.good.COMMODITY_RULE = value;
|
||||
handleChangeSelectSKULIST(value, obj) {
|
||||
console.log('objobjobjobjobj', obj);
|
||||
if (obj.COMMODITY_STOCK > 0) {
|
||||
this.good.COMMODITY_RULE = obj.COMMODITY_NAME;
|
||||
this.good.RTCOMMODITY_MULTI_ID = value;
|
||||
this.good.COMMODITY_MEMBERPRICE = obj.COMMODITY_MEMBERPRICE
|
||||
this.good.COMMODITY_PURCHASEPRICE = obj.COMMODITY_PURCHASEPRICE
|
||||
}
|
||||
},
|
||||
// 添加商品到购物车
|
||||
touchOnGoods(e, obj) {
|
||||
@ -1750,7 +1853,7 @@ export default {
|
||||
|
||||
.shopPopupBox {
|
||||
width: 100%;
|
||||
height: 70vh;
|
||||
height: 80vh;
|
||||
background: #fff;
|
||||
border-radius: 16rpx 16rpx 0 0;
|
||||
box-sizing: border-box;
|
||||
@ -1758,8 +1861,9 @@ export default {
|
||||
|
||||
.shopPopupContent {
|
||||
width: 100%;
|
||||
height: calc(70vh - 92rpx - 64rpx);
|
||||
height: calc(80vh - 80px - 32px + 12rpx);
|
||||
margin-bottom: 12rpx;
|
||||
box-sizing: border-box;
|
||||
|
||||
.detailTop {
|
||||
display: flex;
|
||||
@ -1832,201 +1936,224 @@ export default {
|
||||
}
|
||||
}
|
||||
|
||||
.detailMessage {
|
||||
margin-top: 16px;
|
||||
border-bottom: 1px solid #f2f4f5;
|
||||
padding-bottom: 16px;
|
||||
.scrollDetailBox {
|
||||
width: 100%;
|
||||
height: calc(80vh - 80px - 32px + 12rpx - 80px);
|
||||
|
||||
.detailTitle {
|
||||
font-size: 14px;
|
||||
font-family: PingFangSC-Semibold, PingFang SC;
|
||||
font-weight: 600;
|
||||
color: #020e1a;
|
||||
line-height: 20px;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.detailText {
|
||||
font-size: 14px;
|
||||
font-family: PingFangSC-Regular, PingFang SC;
|
||||
font-weight: 400;
|
||||
color: #6c737a;
|
||||
line-height: 18px;
|
||||
}
|
||||
}
|
||||
.detailMessage {
|
||||
margin-top: 16px;
|
||||
border-bottom: 1px solid #f2f4f5;
|
||||
padding-bottom: 16px;
|
||||
|
||||
.orderDetail {
|
||||
margin-top: 16px;
|
||||
.detailTitle {
|
||||
font-size: 14px;
|
||||
font-family: PingFangSC-Semibold, PingFang SC;
|
||||
font-weight: 600;
|
||||
color: #020e1a;
|
||||
line-height: 20px;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.orderTitle {
|
||||
font-size: 14px;
|
||||
font-family: PingFangSC-Semibold, PingFang SC;
|
||||
font-weight: 600;
|
||||
color: #020e1a;
|
||||
line-height: 20px;
|
||||
}
|
||||
|
||||
.numBox {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-top: 12px;
|
||||
|
||||
.numTitle {
|
||||
.detailText {
|
||||
font-size: 14px;
|
||||
font-family: PingFangSC-Regular, PingFang SC;
|
||||
font-weight: 400;
|
||||
color: #6c737a;
|
||||
line-height: 18px;
|
||||
}
|
||||
}
|
||||
|
||||
.orderDetail {
|
||||
margin-top: 16px;
|
||||
padding-bottom: 32rpx;
|
||||
|
||||
.orderTitle {
|
||||
font-size: 14px;
|
||||
font-family: PingFangSC-Semibold, PingFang SC;
|
||||
font-weight: 600;
|
||||
color: #020e1a;
|
||||
line-height: 20px;
|
||||
}
|
||||
|
||||
.cartcontrol {
|
||||
width: 150px;
|
||||
height: 30px;
|
||||
line-height: 24px;
|
||||
.numBox {
|
||||
display: flex;
|
||||
justify-content: flex-start;
|
||||
border: 1px solid rgba(2, 14, 26, 0.06);
|
||||
border-radius: 2px;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-top: 12px;
|
||||
|
||||
.subtract {
|
||||
width: 30px;
|
||||
.numTitle {
|
||||
font-size: 14px;
|
||||
font-family: PingFangSC-Regular, PingFang SC;
|
||||
font-weight: 400;
|
||||
color: #020e1a;
|
||||
line-height: 20px;
|
||||
}
|
||||
|
||||
.cartcontrol {
|
||||
width: 150px;
|
||||
height: 30px;
|
||||
background: #f2f4f5;
|
||||
line-height: 24px;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
border-radius: 2px 0 0 2px;
|
||||
font-size: 8px;
|
||||
color: #9fa3a8;
|
||||
justify-content: flex-start;
|
||||
border: 1px solid rgba(2, 14, 26, 0.06);
|
||||
border-radius: 2px;
|
||||
|
||||
.img {
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
.subtract {
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
background: #f2f4f5;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
border-radius: 2px 0 0 2px;
|
||||
font-size: 8px;
|
||||
color: #9fa3a8;
|
||||
|
||||
.img {
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
}
|
||||
}
|
||||
|
||||
.cart-count {
|
||||
height: 30px !important;
|
||||
font-size: 16px;
|
||||
line-height: 30px;
|
||||
flex: 1;
|
||||
}
|
||||
}
|
||||
|
||||
.cart-count {
|
||||
height: 30px !important;
|
||||
font-size: 16px;
|
||||
line-height: 30px;
|
||||
flex: 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.sizeBox {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-top: 12px;
|
||||
|
||||
.sizeTitle {
|
||||
font-size: 14px;
|
||||
font-family: PingFangSC-Regular, PingFang SC;
|
||||
font-weight: 400;
|
||||
color: #020e1a;
|
||||
line-height: 20px;
|
||||
}
|
||||
|
||||
.sizeList {
|
||||
display: flex;
|
||||
|
||||
.sizeItem {
|
||||
font-size: 12px;
|
||||
font-family: PingFangSC-Regular, PingFang SC;
|
||||
font-weight: 400;
|
||||
color: #000;
|
||||
line-height: 18px;
|
||||
padding: 4px 16px;
|
||||
background: #dbdad6;
|
||||
border-radius: 4px;
|
||||
margin-left: 8px;
|
||||
}
|
||||
|
||||
.selectSizeItem {
|
||||
font-size: 12px;
|
||||
font-family: PingFangSC-Regular, PingFang SC;
|
||||
font-weight: 400;
|
||||
color: #1890ff;
|
||||
line-height: 18px;
|
||||
padding: 4px 16px;
|
||||
background: #e7f3ff;
|
||||
border-radius: 4px;
|
||||
margin-left: 8px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.descBox {
|
||||
width: 100%;
|
||||
height: 76px;
|
||||
background: #f2f4f5;
|
||||
border-radius: 4px;
|
||||
box-sizing: border-box;
|
||||
padding: 8px 12px;
|
||||
margin-top: 19px;
|
||||
}
|
||||
|
||||
.rightBtn {
|
||||
margin-top: 32rpx;
|
||||
width: 100%;
|
||||
height: 100rpx;
|
||||
background: #fff;
|
||||
box-sizing: border-box;
|
||||
padding: 12rpx;
|
||||
display: flex;
|
||||
|
||||
.addCarBtn {
|
||||
.sizeBox {
|
||||
width: 100%;
|
||||
font-size: 28rpx;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
color: #fff;
|
||||
background: linear-gradient(90deg, #ffc500 0%, #ff8d00 100%);
|
||||
border-radius: 16rpx;
|
||||
margin-top: 12px;
|
||||
|
||||
.sizeTitle {
|
||||
display: inline-block;
|
||||
font-size: 14px;
|
||||
font-family: PingFangSC-Regular, PingFang SC;
|
||||
font-weight: 400;
|
||||
color: #020e1a;
|
||||
line-height: 20px;
|
||||
width: 100rpx;
|
||||
}
|
||||
|
||||
.sizeScrollBox {
|
||||
width: calc(100% - 112rpx);
|
||||
flex: 1;
|
||||
|
||||
.sizeList {
|
||||
// display: flex;
|
||||
width: 100%;
|
||||
|
||||
.sizeItem {
|
||||
font-size: 12px;
|
||||
font-family: PingFangSC-Regular, PingFang SC;
|
||||
font-weight: 400;
|
||||
color: #000;
|
||||
line-height: 18px;
|
||||
padding: 4px 16px;
|
||||
background: #dbdad6;
|
||||
border-radius: 4px;
|
||||
margin-left: 8px;
|
||||
display: inline-block;
|
||||
margin-bottom: 16rpx;
|
||||
}
|
||||
|
||||
.selectSizeItem {
|
||||
display: inline-block;
|
||||
font-size: 12px;
|
||||
font-family: PingFangSC-Regular, PingFang SC;
|
||||
font-weight: 400;
|
||||
color: #1890ff;
|
||||
line-height: 18px;
|
||||
padding: 4px 16px;
|
||||
background: #e7f3ff;
|
||||
border-radius: 4px;
|
||||
margin-left: 8px;
|
||||
margin-bottom: 16rpx;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
.addOrder {
|
||||
width: 50%;
|
||||
font-size: 28rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
color: #fff;
|
||||
background: linear-gradient(90deg, #ff6d00 0%, #ff3a00 100%);
|
||||
border-radius: 0 16rpx 16rpx 0;
|
||||
.descBox {
|
||||
width: 100%;
|
||||
height: 76px;
|
||||
background: #f2f4f5;
|
||||
border-radius: 4px;
|
||||
box-sizing: border-box;
|
||||
padding: 8px 12px;
|
||||
margin-top: 19px;
|
||||
}
|
||||
|
||||
.sellOut {
|
||||
width: 50%;
|
||||
font-size: 28rpx;
|
||||
.rightBtn {
|
||||
margin-top: 32rpx;
|
||||
width: 100%;
|
||||
height: 100rpx;
|
||||
background: #fff;
|
||||
box-sizing: border-box;
|
||||
padding: 12rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
color: #fff;
|
||||
background: #bbbbbb;
|
||||
border-radius: 0 16rpx 16rpx 0;
|
||||
}
|
||||
}
|
||||
|
||||
.submitBtn {
|
||||
font-size: 16px;
|
||||
font-family: PingFangSC-Medium, PingFang SC;
|
||||
font-weight: 500;
|
||||
color: #ffffff;
|
||||
line-height: 22px;
|
||||
width: 100%;
|
||||
height: 40px;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
background: #1890ff;
|
||||
border-radius: 4px;
|
||||
margin-top: 24px;
|
||||
.addCarBtn {
|
||||
width: 100%;
|
||||
font-size: 28rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
color: #fff;
|
||||
background: linear-gradient(90deg, #ffc500 0%, #ff8d00 100%);
|
||||
border-radius: 16rpx;
|
||||
}
|
||||
|
||||
.addOrder {
|
||||
width: 50%;
|
||||
font-size: 28rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
color: #fff;
|
||||
background: linear-gradient(90deg, #ff6d00 0%, #ff3a00 100%);
|
||||
border-radius: 0 16rpx 16rpx 0;
|
||||
}
|
||||
|
||||
.sellOut {
|
||||
width: 50%;
|
||||
font-size: 28rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
color: #fff;
|
||||
background: #bbbbbb;
|
||||
border-radius: 0 16rpx 16rpx 0;
|
||||
}
|
||||
}
|
||||
|
||||
.submitBtn {
|
||||
font-size: 16px;
|
||||
font-family: PingFangSC-Medium, PingFang SC;
|
||||
font-weight: 500;
|
||||
color: #ffffff;
|
||||
line-height: 22px;
|
||||
width: 100%;
|
||||
height: 40px;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
background: #1890ff;
|
||||
border-radius: 4px;
|
||||
margin-top: 24px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
.bottomBtn {
|
||||
|
||||
@ -536,7 +536,7 @@ export default {
|
||||
};
|
||||
console.log("req", req);
|
||||
console.log("this.addressInfo", this.addressInfo);
|
||||
|
||||
return
|
||||
const data = await this.$api.postCoop(req);
|
||||
console.log("data", data);
|
||||
|
||||
|
||||
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": {}
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
{
|
||||
"usingComponents": {},
|
||||
"component": true
|
||||
"component": true,
|
||||
"usingComponents": {}
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
{
|
||||
"usingComponents": {},
|
||||
"component": true
|
||||
"component": true,
|
||||
"usingComponents": {}
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
{
|
||||
"usingComponents": {},
|
||||
"component": true
|
||||
"component": true,
|
||||
"usingComponents": {}
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
{
|
||||
"usingComponents": {},
|
||||
"component": true
|
||||
"component": true,
|
||||
"usingComponents": {}
|
||||
}
|
||||
@ -678,7 +678,14 @@ var _default = {
|
||||
var list = [];
|
||||
this.shopList.forEach(function (item) {
|
||||
if (item.COMMODITY_CODE !== obj.COMMODITY_CODE) {
|
||||
list.push(item);
|
||||
if (obj.RTCOMMODITY_MULTI_ID) {
|
||||
// 规格都一样 说明确实是同一个了 可以删除
|
||||
if (item.RTCOMMODITY_MULTI_ID === obj.RTCOMMODITY_MULTI_ID) {} else {
|
||||
list.push(item);
|
||||
}
|
||||
} else {
|
||||
list.push(item);
|
||||
}
|
||||
}
|
||||
});
|
||||
this.shopList = list;
|
||||
|
||||
@ -125,26 +125,30 @@ var render = function () {
|
||||
var _vm = this
|
||||
var _h = _vm.$createElement
|
||||
var _c = _vm._self._c || _h
|
||||
var g0 = _vm.changBigTypeLoading
|
||||
? _vm.rightShopList && _vm.rightShopList.length > 0
|
||||
var l0 = _vm.changBigTypeLoading
|
||||
? _vm.__map(_vm.visibleList, function (item, i) {
|
||||
var $orig = _vm.__get_orig(item)
|
||||
var g0 = item.SKULIST && item.SKULIST.length > 0
|
||||
return {
|
||||
$orig: $orig,
|
||||
g0: g0,
|
||||
}
|
||||
})
|
||||
: null
|
||||
var l0 =
|
||||
_vm.changBigTypeLoading && g0
|
||||
? _vm.__map(_vm.rightShopList, function (item, index) {
|
||||
var $orig = _vm.__get_orig(item)
|
||||
var g1 = item.SKULIST && item.SKULIST.length > 0
|
||||
return {
|
||||
$orig: $orig,
|
||||
g1: g1,
|
||||
}
|
||||
})
|
||||
: null
|
||||
var g1 = _vm.changBigTypeLoading
|
||||
? !_vm.rightShopList || _vm.rightShopList.length === 0
|
||||
: null
|
||||
if (!_vm._isMounted) {
|
||||
_vm.e0 = function (e) {
|
||||
return (e.target.src = "/static/images/home/defultImg.png")
|
||||
}
|
||||
}
|
||||
_vm.$mp.data = Object.assign(
|
||||
{},
|
||||
{
|
||||
$root: {
|
||||
g0: g0,
|
||||
l0: l0,
|
||||
g1: g1,
|
||||
},
|
||||
}
|
||||
)
|
||||
@ -245,7 +249,17 @@ var _default = {
|
||||
good: {},
|
||||
// 悬浮框里面 选择规格的商品详情
|
||||
systemInfo: {},
|
||||
safeHeight: 0
|
||||
safeHeight: 0,
|
||||
itemHeight: 104,
|
||||
// 单个商品高度(px)
|
||||
virtualListHeight: 520,
|
||||
// 可视区高度(px)，比如显示5个
|
||||
startIndex: 0,
|
||||
endIndex: 0,
|
||||
buffer: 30,
|
||||
// 前后缓冲区
|
||||
visibleList: [],
|
||||
totalHeight: 0
|
||||
};
|
||||
},
|
||||
watch: {
|
||||
@ -264,6 +278,15 @@ var _default = {
|
||||
}
|
||||
},
|
||||
deep: true
|
||||
},
|
||||
rightShopList: {
|
||||
handler: function handler(val) {
|
||||
this.totalHeight = val.length * this.itemHeight;
|
||||
this.startIndex = 0;
|
||||
this.endIndex = Math.min(val.length, Math.ceil(this.virtualListHeight / this.itemHeight) + this.buffer * 2);
|
||||
this.updateVisibleList();
|
||||
},
|
||||
immediate: true
|
||||
}
|
||||
},
|
||||
computed: _objectSpread({}, (0, _vuex.mapGetters)({
|
||||
@ -304,6 +327,7 @@ var _default = {
|
||||
// this.handleGetAllShopItem();
|
||||
}
|
||||
|
||||
this.onVirtualScroll = this.throttle(this.onVirtualScroll, 100); //
|
||||
this.$utils.addUserBehaviorNew();
|
||||
},
|
||||
onShow: function onShow() {
|
||||
@ -379,6 +403,31 @@ var _default = {
|
||||
this.searchText = "";
|
||||
},
|
||||
methods: {
|
||||
// 节流函数
|
||||
throttle: function throttle(fn, delay) {
|
||||
var last = 0;
|
||||
return function () {
|
||||
var now = Date.now();
|
||||
if (now - last > delay) {
|
||||
last = now;
|
||||
for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
|
||||
args[_key] = arguments[_key];
|
||||
}
|
||||
fn.apply(this, args);
|
||||
}
|
||||
};
|
||||
},
|
||||
onVirtualScroll: function onVirtualScroll(e) {
|
||||
var scrollTop = e.detail.scrollTop;
|
||||
var start = Math.floor(scrollTop / this.itemHeight);
|
||||
this.startIndex = Math.max(0, start - this.buffer);
|
||||
// 这里要保证 endIndex 不会超过 rightShopList.length
|
||||
this.endIndex = Math.min(this.rightShopList.length, this.startIndex + Math.ceil(this.virtualListHeight / this.itemHeight) + this.buffer * 2);
|
||||
this.updateVisibleList();
|
||||
},
|
||||
updateVisibleList: function updateVisibleList() {
|
||||
this.visibleList = this.rightShopList.slice(this.startIndex, this.endIndex);
|
||||
},
|
||||
// 打开购物车 或 立即购买的悬浮框 1 打开购物车 2 立即购买 3售罄
|
||||
handleShowShopPopup: function handleShowShopPopup() {
|
||||
var _this = this;
|
||||
@ -397,7 +446,7 @@ var _default = {
|
||||
return;
|
||||
}
|
||||
console.log("good", this.good);
|
||||
if (this.good.COMMODITY_RULE === "默认" || !this.good.COMMODITY_RULE) {
|
||||
if (this.good.RTCOMMODITY_MULTI_ID === "默认" || !this.good.RTCOMMODITY_MULTI_ID) {
|
||||
uni.showToast({
|
||||
title: "请先选择规格！",
|
||||
icon: "none"
|
||||
@ -418,8 +467,28 @@ var _default = {
|
||||
});
|
||||
if (filterList && filterList.length > 0) {
|
||||
list.forEach(function (item) {
|
||||
if (item.COMMODITY_ID === _this.good.COMMODITY_ID) {
|
||||
item.count = _this.good.count;
|
||||
// 先看看有没有规格id 如果选了规格 不一样规格 算不同的商品
|
||||
if (_this.good.RTCOMMODITY_MULTI_ID) {
|
||||
var filterRuleList = list.filter(function (item) {
|
||||
return item.RTCOMMODITY_MULTI_ID === _this.good.RTCOMMODITY_MULTI_ID;
|
||||
});
|
||||
// 如果有一样规格的 就替换值 没有 就等于新增商品
|
||||
if (filterRuleList && filterRuleList.length > 0) {
|
||||
if (item.COMMODITY_ID === _this.good.COMMODITY_ID) {
|
||||
item.count = _this.good.count;
|
||||
}
|
||||
} else {
|
||||
list.push(_objectSpread({}, _this.good));
|
||||
nowShopList.forEach(function (item) {
|
||||
if (item.COMMODITY_ID === _this.good.COMMODITY_ID) {
|
||||
item.count = _this.good.count;
|
||||
}
|
||||
});
|
||||
}
|
||||
} else {
|
||||
if (item.COMMODITY_ID === _this.good.COMMODITY_ID) {
|
||||
item.count = _this.good.count;
|
||||
}
|
||||
}
|
||||
});
|
||||
nowShopList.forEach(function (item) {
|
||||
@ -523,13 +592,13 @@ var _default = {
|
||||
handleSearch: function handleSearch() {
|
||||
var _this3 = this;
|
||||
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
|
||||
var data, list, shopList;
|
||||
var data, list, shopList, res, shopIdList;
|
||||
return _regenerator.default.wrap(function _callee2$(_context2) {
|
||||
while (1) {
|
||||
switch (_context2.prev = _context2.next) {
|
||||
case 0:
|
||||
if (!_this3.searchText) {
|
||||
_context2.next = 14;
|
||||
_context2.next = 17;
|
||||
break;
|
||||
}
|
||||
uni.showLoading({
|
||||
@ -543,20 +612,21 @@ var _default = {
|
||||
// excludeNature: this.pageType === "UnionMall" ? "" : 5070,
|
||||
// commodityNature: this.pageType === "UnionMall" ? 5070 : "",
|
||||
// payMethod: "1000,3000",
|
||||
// justCommodity: 1,
|
||||
// // justCommodity: 1,
|
||||
// });
|
||||
_context2.next = 4;
|
||||
return _this3.$api.$javaGet('/third-party/getExcludeWeChatGetMallGoodsInfo', {
|
||||
ownerUnitId: 911,
|
||||
appId: "wxee018fb96955552a",
|
||||
commodityName: _this3.searchText,
|
||||
excludeNature: _this3.pageType === "UnionMall" ? "" : 5070,
|
||||
commodityNature: _this3.pageType === "UnionMall" ? 5070 : "",
|
||||
payMethod: "1000,3000",
|
||||
justCommodity: 1
|
||||
excludeNature: _this3.pageType === "UnionMall" ? null : 5070,
|
||||
commodityNature: _this3.pageType === "UnionMall" ? 5070 : null,
|
||||
payMethod: "1000,3000"
|
||||
// justCommodity: 1,
|
||||
});
|
||||
case 4:
|
||||
data = _context2.sent;
|
||||
uni.hideLoading();
|
||||
list = data.Data.List;
|
||||
console.log("list", list);
|
||||
shopList = [];
|
||||
@ -595,11 +665,22 @@ var _default = {
|
||||
});
|
||||
}
|
||||
console.log("搜索商品", shopList);
|
||||
_this3.rightShopList = shopList;
|
||||
uni.hideLoading();
|
||||
_context2.next = 15;
|
||||
|
||||
// 再去一下重 因为单个商品 多类别
|
||||
res = [];
|
||||
shopIdList = [];
|
||||
if (shopList && shopList.length > 0) {
|
||||
shopList.forEach(function (item) {
|
||||
if (shopIdList.indexOf(item.COMMODITY_ID) === -1) {
|
||||
res.push(item);
|
||||
shopIdList.push(item.COMMODITY_ID);
|
||||
}
|
||||
});
|
||||
}
|
||||
_this3.rightShopList = res;
|
||||
_context2.next = 18;
|
||||
break;
|
||||
case 14:
|
||||
case 17:
|
||||
if (_this3.pageType === "UnionMall") {
|
||||
// 工会之家拿到的商品类型
|
||||
_this3.handleGetUnionMallShopType();
|
||||
@ -607,7 +688,7 @@ var _default = {
|
||||
// 拿到全部商品类型
|
||||
_this3.handleGetShopType();
|
||||
}
|
||||
case 15:
|
||||
case 18:
|
||||
case "end":
|
||||
return _context2.stop();
|
||||
}
|
||||
@ -683,7 +764,7 @@ var _default = {
|
||||
handleGetAllShopItem: function handleGetAllShopItem(id) {
|
||||
var _this5 = this;
|
||||
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
|
||||
var data, list, thisAllType, haveAll, leftIndex, shopList, thisTypeAllShop, obj, newList, allShopList;
|
||||
var data, list, thisAllType, haveAll, leftIndex, shopList, thisTypeAllShop, allShopID, obj, newList, allShopList;
|
||||
return _regenerator.default.wrap(function _callee4$(_context4) {
|
||||
while (1) {
|
||||
switch (_context4.prev = _context4.next) {
|
||||
@ -699,19 +780,21 @@ var _default = {
|
||||
// commodityName: this.searchText,
|
||||
// excludeNature: this.pageType === "UnionMall" ? "" : 5070,
|
||||
// commodityNature: this.pageType === "UnionMall" ? 5070 : "",
|
||||
// justCommodity: 1,
|
||||
// // justCommodity: 1,
|
||||
// });
|
||||
_context4.next = 4;
|
||||
return _this5.$api.$javaGet('/third-party/getExcludeWeChatGetMallGoodsInfo', {
|
||||
ownerUnitId: 911,
|
||||
userdefinedTypeId: _this5.searchText ? "" : id,
|
||||
userdefinedtypeId: _this5.searchText ? "" : id,
|
||||
commodityName: _this5.searchText,
|
||||
excludeNature: _this5.pageType === "UnionMall" ? "" : 5070,
|
||||
commodityNature: _this5.pageType === "UnionMall" ? 5070 : "",
|
||||
justCommodity: 1
|
||||
commodityNature: _this5.pageType === "UnionMall" ? 5070 : ""
|
||||
// justCommodity: 1,
|
||||
});
|
||||
case 4:
|
||||
data = _context4.sent;
|
||||
uni.hideLoading();
|
||||
list = data.Data.List;
|
||||
console.log("拿到全部的商品", list);
|
||||
thisAllType = [];
|
||||
@ -770,12 +853,16 @@ var _default = {
|
||||
console.log("list", list);
|
||||
console.log("list[leftIndex]", list[leftIndex]);
|
||||
// 这一大类的全部商品
|
||||
thisTypeAllShop = [];
|
||||
thisTypeAllShop = []; // 当前的全部商品id
|
||||
allShopID = [];
|
||||
list.forEach(function (item) {
|
||||
if (item.UserdefinedType_Name !== "全部") {
|
||||
if (item.COMMODITYLIST && item.COMMODITYLIST.length > 0 && (item.USERDEFINEDTYPE_PID === id || item.USERDEFINEDTYPE_ID === id)) {
|
||||
item.COMMODITYLIST.forEach(function (subItem) {
|
||||
thisTypeAllShop.push(subItem);
|
||||
if (allShopID.indexOf(subItem.COMMODITY_ID) === -1) {
|
||||
thisTypeAllShop.push(subItem);
|
||||
allShopID.push(subItem.COMMODITY_ID);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@ -885,7 +972,7 @@ var _default = {
|
||||
}
|
||||
console.log("现在的小类", _this5.leftTypeList);
|
||||
uni.hideLoading();
|
||||
case 28:
|
||||
case 29:
|
||||
case "end":
|
||||
return _context4.stop();
|
||||
}
|
||||
@ -1042,13 +1129,20 @@ var _default = {
|
||||
if (currentShop.count > 0) {} else {
|
||||
currentShop.count = 1;
|
||||
}
|
||||
currentShop.SKULIST[0].COMMODITY_STOCK = 0;
|
||||
this.good = currentShop;
|
||||
console.log("this.good", this.good);
|
||||
this.$refs.shopPopup.open("bottom");
|
||||
},
|
||||
// 改变当前选中的规格
|
||||
handleChangeSelectSKULIST: function handleChangeSelectSKULIST(value) {
|
||||
this.good.COMMODITY_RULE = value;
|
||||
handleChangeSelectSKULIST: function handleChangeSelectSKULIST(value, obj) {
|
||||
console.log('objobjobjobjobj', obj);
|
||||
if (obj.COMMODITY_STOCK > 0) {
|
||||
this.good.COMMODITY_RULE = obj.COMMODITY_NAME;
|
||||
this.good.RTCOMMODITY_MULTI_ID = value;
|
||||
this.good.COMMODITY_MEMBERPRICE = obj.COMMODITY_MEMBERPRICE;
|
||||
this.good.COMMODITY_PURCHASEPRICE = obj.COMMODITY_PURCHASEPRICE;
|
||||
}
|
||||
},
|
||||
// 添加商品到购物车
|
||||
touchOnGoods: function touchOnGoods(e, obj) {
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -457,7 +457,7 @@
|
||||
}
|
||||
.main .shopPopupBox.data-v-36e5d840 {
|
||||
width: 100%;
|
||||
height: 70vh;
|
||||
height: 80vh;
|
||||
background: #fff;
|
||||
border-radius: 16rpx 16rpx 0 0;
|
||||
box-sizing: border-box;
|
||||
@ -465,8 +465,9 @@
|
||||
}
|
||||
.main .shopPopupBox .shopPopupContent.data-v-36e5d840 {
|
||||
width: 100%;
|
||||
height: calc(70vh - 92rpx - 64rpx);
|
||||
height: calc(80vh - 80px - 32px + 12rpx);
|
||||
margin-bottom: 12rpx;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.main .shopPopupBox .shopPopupContent .detailTop.data-v-36e5d840 {
|
||||
display: flex;
|
||||
@ -529,12 +530,16 @@
|
||||
color: #9fa3a8;
|
||||
line-height: 18px;
|
||||
}
|
||||
.main .shopPopupBox .shopPopupContent .detailMessage.data-v-36e5d840 {
|
||||
.main .shopPopupBox .shopPopupContent .scrollDetailBox.data-v-36e5d840 {
|
||||
width: 100%;
|
||||
height: calc(80vh - 80px - 32px + 12rpx - 80px);
|
||||
}
|
||||
.main .shopPopupBox .shopPopupContent .scrollDetailBox .detailMessage.data-v-36e5d840 {
|
||||
margin-top: 16px;
|
||||
border-bottom: 1px solid #f2f4f5;
|
||||
padding-bottom: 16px;
|
||||
}
|
||||
.main .shopPopupBox .shopPopupContent .detailMessage .detailTitle.data-v-36e5d840 {
|
||||
.main .shopPopupBox .shopPopupContent .scrollDetailBox .detailMessage .detailTitle.data-v-36e5d840 {
|
||||
font-size: 14px;
|
||||
font-family: PingFangSC-Semibold, PingFang SC;
|
||||
font-weight: 600;
|
||||
@ -542,37 +547,38 @@
|
||||
line-height: 20px;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
.main .shopPopupBox .shopPopupContent .detailMessage .detailText.data-v-36e5d840 {
|
||||
.main .shopPopupBox .shopPopupContent .scrollDetailBox .detailMessage .detailText.data-v-36e5d840 {
|
||||
font-size: 14px;
|
||||
font-family: PingFangSC-Regular, PingFang SC;
|
||||
font-weight: 400;
|
||||
color: #6c737a;
|
||||
line-height: 18px;
|
||||
}
|
||||
.main .shopPopupBox .shopPopupContent .orderDetail.data-v-36e5d840 {
|
||||
.main .shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail.data-v-36e5d840 {
|
||||
margin-top: 16px;
|
||||
padding-bottom: 32rpx;
|
||||
}
|
||||
.main .shopPopupBox .shopPopupContent .orderDetail .orderTitle.data-v-36e5d840 {
|
||||
.main .shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail .orderTitle.data-v-36e5d840 {
|
||||
font-size: 14px;
|
||||
font-family: PingFangSC-Semibold, PingFang SC;
|
||||
font-weight: 600;
|
||||
color: #020e1a;
|
||||
line-height: 20px;
|
||||
}
|
||||
.main .shopPopupBox .shopPopupContent .orderDetail .numBox.data-v-36e5d840 {
|
||||
.main .shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail .numBox.data-v-36e5d840 {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-top: 12px;
|
||||
}
|
||||
.main .shopPopupBox .shopPopupContent .orderDetail .numBox .numTitle.data-v-36e5d840 {
|
||||
.main .shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail .numBox .numTitle.data-v-36e5d840 {
|
||||
font-size: 14px;
|
||||
font-family: PingFangSC-Regular, PingFang SC;
|
||||
font-weight: 400;
|
||||
color: #020e1a;
|
||||
line-height: 20px;
|
||||
}
|
||||
.main .shopPopupBox .shopPopupContent .orderDetail .numBox .cartcontrol.data-v-36e5d840 {
|
||||
.main .shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail .numBox .cartcontrol.data-v-36e5d840 {
|
||||
width: 150px;
|
||||
height: 30px;
|
||||
line-height: 24px;
|
||||
@ -581,7 +587,7 @@
|
||||
border: 1px solid rgba(2, 14, 26, 0.06);
|
||||
border-radius: 2px;
|
||||
}
|
||||
.main .shopPopupBox .shopPopupContent .orderDetail .numBox .cartcontrol .subtract.data-v-36e5d840 {
|
||||
.main .shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail .numBox .cartcontrol .subtract.data-v-36e5d840 {
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
background: #f2f4f5;
|
||||
@ -592,33 +598,40 @@
|
||||
font-size: 8px;
|
||||
color: #9fa3a8;
|
||||
}
|
||||
.main .shopPopupBox .shopPopupContent .orderDetail .numBox .cartcontrol .subtract .img.data-v-36e5d840 {
|
||||
.main .shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail .numBox .cartcontrol .subtract .img.data-v-36e5d840 {
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
}
|
||||
.main .shopPopupBox .shopPopupContent .orderDetail .numBox .cartcontrol .cart-count.data-v-36e5d840 {
|
||||
.main .shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail .numBox .cartcontrol .cart-count.data-v-36e5d840 {
|
||||
height: 30px !important;
|
||||
font-size: 16px;
|
||||
line-height: 30px;
|
||||
flex: 1;
|
||||
}
|
||||
.main .shopPopupBox .shopPopupContent .orderDetail .sizeBox.data-v-36e5d840 {
|
||||
.main .shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail .sizeBox.data-v-36e5d840 {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-top: 12px;
|
||||
}
|
||||
.main .shopPopupBox .shopPopupContent .orderDetail .sizeBox .sizeTitle.data-v-36e5d840 {
|
||||
.main .shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail .sizeBox .sizeTitle.data-v-36e5d840 {
|
||||
display: inline-block;
|
||||
font-size: 14px;
|
||||
font-family: PingFangSC-Regular, PingFang SC;
|
||||
font-weight: 400;
|
||||
color: #020e1a;
|
||||
line-height: 20px;
|
||||
width: 100rpx;
|
||||
}
|
||||
.main .shopPopupBox .shopPopupContent .orderDetail .sizeBox .sizeList.data-v-36e5d840 {
|
||||
display: flex;
|
||||
.main .shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail .sizeBox .sizeScrollBox.data-v-36e5d840 {
|
||||
width: calc(100% - 112rpx);
|
||||
flex: 1;
|
||||
}
|
||||
.main .shopPopupBox .shopPopupContent .orderDetail .sizeBox .sizeList .sizeItem.data-v-36e5d840 {
|
||||
.main .shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail .sizeBox .sizeScrollBox .sizeList.data-v-36e5d840 {
|
||||
width: 100%;
|
||||
}
|
||||
.main .shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail .sizeBox .sizeScrollBox .sizeList .sizeItem.data-v-36e5d840 {
|
||||
font-size: 12px;
|
||||
font-family: PingFangSC-Regular, PingFang SC;
|
||||
font-weight: 400;
|
||||
@ -628,8 +641,11 @@
|
||||
background: #dbdad6;
|
||||
border-radius: 4px;
|
||||
margin-left: 8px;
|
||||
display: inline-block;
|
||||
margin-bottom: 16rpx;
|
||||
}
|
||||
.main .shopPopupBox .shopPopupContent .orderDetail .sizeBox .sizeList .selectSizeItem.data-v-36e5d840 {
|
||||
.main .shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail .sizeBox .sizeScrollBox .sizeList .selectSizeItem.data-v-36e5d840 {
|
||||
display: inline-block;
|
||||
font-size: 12px;
|
||||
font-family: PingFangSC-Regular, PingFang SC;
|
||||
font-weight: 400;
|
||||
@ -639,8 +655,9 @@
|
||||
background: #e7f3ff;
|
||||
border-radius: 4px;
|
||||
margin-left: 8px;
|
||||
margin-bottom: 16rpx;
|
||||
}
|
||||
.main .shopPopupBox .shopPopupContent .orderDetail .descBox.data-v-36e5d840 {
|
||||
.main .shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail .descBox.data-v-36e5d840 {
|
||||
width: 100%;
|
||||
height: 76px;
|
||||
background: #f2f4f5;
|
||||
@ -649,7 +666,7 @@
|
||||
padding: 8px 12px;
|
||||
margin-top: 19px;
|
||||
}
|
||||
.main .shopPopupBox .shopPopupContent .orderDetail .rightBtn.data-v-36e5d840 {
|
||||
.main .shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail .rightBtn.data-v-36e5d840 {
|
||||
margin-top: 32rpx;
|
||||
width: 100%;
|
||||
height: 100rpx;
|
||||
@ -658,7 +675,7 @@
|
||||
padding: 12rpx;
|
||||
display: flex;
|
||||
}
|
||||
.main .shopPopupBox .shopPopupContent .orderDetail .rightBtn .addCarBtn.data-v-36e5d840 {
|
||||
.main .shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail .rightBtn .addCarBtn.data-v-36e5d840 {
|
||||
width: 100%;
|
||||
font-size: 28rpx;
|
||||
display: flex;
|
||||
@ -668,7 +685,7 @@
|
||||
background: linear-gradient(90deg, #ffc500 0%, #ff8d00 100%);
|
||||
border-radius: 16rpx;
|
||||
}
|
||||
.main .shopPopupBox .shopPopupContent .orderDetail .rightBtn .addOrder.data-v-36e5d840 {
|
||||
.main .shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail .rightBtn .addOrder.data-v-36e5d840 {
|
||||
width: 50%;
|
||||
font-size: 28rpx;
|
||||
display: flex;
|
||||
@ -678,7 +695,7 @@
|
||||
background: linear-gradient(90deg, #ff6d00 0%, #ff3a00 100%);
|
||||
border-radius: 0 16rpx 16rpx 0;
|
||||
}
|
||||
.main .shopPopupBox .shopPopupContent .orderDetail .rightBtn .sellOut.data-v-36e5d840 {
|
||||
.main .shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail .rightBtn .sellOut.data-v-36e5d840 {
|
||||
width: 50%;
|
||||
font-size: 28rpx;
|
||||
display: flex;
|
||||
@ -688,7 +705,7 @@
|
||||
background: #bbbbbb;
|
||||
border-radius: 0 16rpx 16rpx 0;
|
||||
}
|
||||
.main .shopPopupBox .shopPopupContent .orderDetail .submitBtn.data-v-36e5d840 {
|
||||
.main .shopPopupBox .shopPopupContent .scrollDetailBox .orderDetail .submitBtn.data-v-36e5d840 {
|
||||
font-size: 16px;
|
||||
font-family: PingFangSC-Medium, PingFang SC;
|
||||
font-weight: 500;
|
||||
|
||||
@ -583,13 +583,12 @@ var _default = {
|
||||
|
||||
console.log("req", req);
|
||||
console.log("this.addressInfo", _this5.addressInfo);
|
||||
_context3.next = 33;
|
||||
return _this5.$api.postCoop(req);
|
||||
case 33:
|
||||
return _context3.abrupt("return");
|
||||
case 34:
|
||||
data = _context3.sent;
|
||||
console.log("data", data);
|
||||
if (!(data.ResultCode === "100")) {
|
||||
_context3.next = 48;
|
||||
_context3.next = 49;
|
||||
break;
|
||||
}
|
||||
_this5$addressInfo$ME = _this5.addressInfo.MEMBERADDRESS_CODE.split(","), _this5$addressInfo$ME2 = (0, _slicedToArray2.default)(_this5$addressInfo$ME, 4), provinceId = _this5$addressInfo$ME2[0], cityId = _this5$addressInfo$ME2[1], districtId = _this5$addressInfo$ME2[2], streetId = _this5$addressInfo$ME2[3];
|
||||
@ -629,9 +628,9 @@ var _default = {
|
||||
expect_time: "",
|
||||
priceContentBase: priceContentBase
|
||||
};
|
||||
_context3.next = 43;
|
||||
_context3.next = 44;
|
||||
return _this5.$api.$postNode("/pino/order/submit", _req);
|
||||
case 43:
|
||||
case 44:
|
||||
pingnuoData = _context3.sent;
|
||||
console.log("pingnuoData", pingnuoData);
|
||||
if (pingnuoData.code === 200) {
|
||||
@ -683,9 +682,9 @@ var _default = {
|
||||
});
|
||||
_this5.isMakeOrdering = false;
|
||||
}
|
||||
_context3.next = 50;
|
||||
_context3.next = 51;
|
||||
break;
|
||||
case 48:
|
||||
case 49:
|
||||
// uni.showToast({
|
||||
// title: data.ResultDesc,
|
||||
// icon: "none",
|
||||
@ -697,7 +696,7 @@ var _default = {
|
||||
success: function success(res) {}
|
||||
});
|
||||
_this5.isMakeOrdering = false;
|
||||
case 50:
|
||||
case 51:
|
||||
case "end":
|
||||
return _context3.stop();
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user