update
This commit is contained in:
ylj20011123
parent
c3fa6c2fb5
commit
e4af4ece81
@ -10,13 +10,18 @@
|
||||
</view>
|
||||
<view v-if="!managering" class="funList">
|
||||
<view class="funItem" v-for="(item, index) in allFunList" :key="index" @click="handleFunClick(item)">
|
||||
<view class="funLeft">
|
||||
<view class="funLeft" v-if="item.value !== 12">
|
||||
<image class="funIcon" :src="pageType === 'spring' ? item.springSrc : item.src" />
|
||||
<text class="funText">{{ item.label || "-" }}</text>
|
||||
</view>
|
||||
<view class="funRight">
|
||||
<!-- <image class="editIcon" src="/static/images/home/editIcon.svg" /> -->
|
||||
</view>
|
||||
<button v-else class="no-border-btn" hover-class="none" hover-start-time="0" hover-stay-time="0"
|
||||
style="background-color: transparent;border-width: 0;padding: 0;" open-type="contact" @contact="onContact">
|
||||
<image class="funIcon" :src="pageType === 'spring' ? item.springSrc : item.src" />
|
||||
<text class="funText">{{ item.label || "-" }}</text>
|
||||
</button>
|
||||
<!-- <view class="funRight"> -->
|
||||
<!-- <image class="editIcon" src="/static/images/home/editIcon.svg" /> -->
|
||||
<!-- </view> -->
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -161,9 +166,13 @@ export default {
|
||||
});
|
||||
} else if (obj.value === 12) {
|
||||
// 售后
|
||||
uni.navigateTo({
|
||||
url: `/pages/noDataPage/index`,
|
||||
});
|
||||
// uni.navigateTo({
|
||||
// url: `/pages/noDataPage/index`,
|
||||
// });
|
||||
|
||||
// uni.makePhoneCall({
|
||||
// phoneNumber: '087167199960' //仅为示例
|
||||
// });
|
||||
} else if (obj.value === 13) {
|
||||
// 加水
|
||||
uni.scanCode({
|
||||
@ -284,6 +293,42 @@ export default {
|
||||
}
|
||||
}
|
||||
|
||||
.no-border-btn {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: flex-start;
|
||||
|
||||
.funIcon {
|
||||
width: 72rpx;
|
||||
height: 72rpx;
|
||||
margin-right: 16rpx;
|
||||
}
|
||||
|
||||
.funText {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
color: #130f05;
|
||||
line-height: 40rpx;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
}
|
||||
}
|
||||
|
||||
/* 覆盖系统生成的伪元素 */
|
||||
.no-border-btn::after,
|
||||
.no-border-btn::before {
|
||||
content: '' !important;
|
||||
border: 0 !important;
|
||||
box-shadow: none !important;
|
||||
display: none !important;
|
||||
height: 0 !important;
|
||||
width: 0 !important;
|
||||
-webkit-transform: scale(0) !important;
|
||||
transform: scale(0) !important;
|
||||
}
|
||||
|
||||
.funRight {
|
||||
width: 32rpx;
|
||||
height: 32rpx;
|
||||
|
||||
@ -83,8 +83,17 @@
|
||||
<view class="funItem" v-for="(item, index) in funList.slice(0, 9)" :key="index" :style="{
|
||||
marginBottom: index < 5 ? '32rpx' : '',
|
||||
}" @click="handleFunClick(item)">
|
||||
<image class="funItemIcon" :src="pageType === 'spring' ? item.springSrc : item.src" />
|
||||
<text class="funItemText">{{ item.label }}</text>
|
||||
<view style="display: flex;flex-direction: column;align-items: center;" v-if="item.value !== 12">
|
||||
<image class="funItemIcon" :src="pageType === 'spring' ? item.springSrc : item.src" />
|
||||
<text class="funItemText">{{ item.label }}</text>
|
||||
</view>
|
||||
<button v-else class="no-border-btn" hover-class="none" hover-start-time="0" hover-stay-time="0"
|
||||
style="background-color: transparent;border-width: 0;padding: 0;" open-type="contact" @contact="onContact">
|
||||
<view style="display: flex;flex-direction: column;align-items: center;">
|
||||
<image class="funItemIcon" :src="pageType === 'spring' ? item.springSrc : item.src" />
|
||||
<text class="funItemText">{{ item.label }}</text>
|
||||
</view>
|
||||
</button>
|
||||
</view>
|
||||
<view class="funItem" @click="handleGoAllFun">
|
||||
<image class="funItemIcon" :src="pageType === 'spring' ? allFun.springSrc : allFun.src" />
|
||||
@ -1623,9 +1632,12 @@ export default {
|
||||
});
|
||||
} else if (obj.value === 12) {
|
||||
// 售后
|
||||
uni.navigateTo({
|
||||
url: `/pages/noDataPage/index`,
|
||||
});
|
||||
// uni.navigateTo({
|
||||
// url: `/pages/noDataPage/index`,
|
||||
// });
|
||||
// uni.makePhoneCall({
|
||||
// phoneNumber: '087167199960' //仅为示例
|
||||
// });
|
||||
} else if (obj.value === 13) {
|
||||
// 加水
|
||||
uni.scanCode({
|
||||
@ -2599,6 +2611,19 @@ export default {
|
||||
text-align: right;
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
/* 覆盖系统生成的伪元素 */
|
||||
.no-border-btn::after,
|
||||
.no-border-btn::before {
|
||||
content: '' !important;
|
||||
border: 0 !important;
|
||||
box-shadow: none !important;
|
||||
display: none !important;
|
||||
height: 0 !important;
|
||||
width: 0 !important;
|
||||
-webkit-transform: scale(0) !important;
|
||||
transform: scale(0) !important;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -9,9 +9,9 @@
|
||||
</div>
|
||||
<div class="starRate">
|
||||
<image class="shopImg" mode="aspectFit" lazy-load="true" :src="saveMsg.merchantsId
|
||||
? storeMsg.MERCHANTS_LOGO ||
|
||||
? storeMsg.MERCHANTS_LOGO || storeMsg.IMAGE_PATH ||
|
||||
'https://eshangtech.com/ShopICO/no-picture.png'
|
||||
: storeMsg.MERCHANTS_LOGO ||
|
||||
: storeMsg.MERCHANTS_LOGO || proMsg.IMAGE_PATH ||
|
||||
'https://eshangtech.com/ShopICO/no-picture.png'
|
||||
" />
|
||||
|
||||
@ -74,6 +74,7 @@ export default {
|
||||
storeMsg: {},
|
||||
imgsList: [],
|
||||
proMsg: {}, // 商品评论的列表
|
||||
currentShopIndex: 0,// 当前订单里面的商品 索引 用于看到 是第几个商品
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
@ -278,6 +279,7 @@ export default {
|
||||
},
|
||||
getMallOrderDetail(obj) {
|
||||
let _this = this;
|
||||
|
||||
_this.$api
|
||||
.getCoop({
|
||||
action_type: "getOrderCommodity",
|
||||
@ -290,6 +292,7 @@ export default {
|
||||
if (res.ResultCode === "100") {
|
||||
let _data = res.Data;
|
||||
_this.proMsg = _data;
|
||||
console.log('_this.proMsg_this.proMsg', _this.proMsg);
|
||||
}
|
||||
});
|
||||
},
|
||||
@ -308,6 +311,8 @@ export default {
|
||||
this.imgsList = [];
|
||||
},
|
||||
onLoad(option) {
|
||||
console.log('optionoptionoptionoption', option);
|
||||
|
||||
if (option.saleBillId) {
|
||||
this.saveMsg.saleBillId = option.saleBillId;
|
||||
}
|
||||
|
||||
@ -48,7 +48,7 @@
|
||||
</view>
|
||||
|
||||
<view class="orderItemCenter"
|
||||
v-for="(subItem, subIndex) in item.GOODSList.slice(0, item.isShowMore ? item.GOODSList.length : 5)"
|
||||
v-for="(subItem, subIndex) in (item && item.GOODSList ? item.GOODSList.slice(0, (item.isShowMore ? item.GOODSList.length : 5)) : [])"
|
||||
:key="subIndex">
|
||||
<view class="orderItemCenterLeft" @click.stop="handleGoShopDetail(item, subIndex)">
|
||||
<image class="orderItemShopImg"
|
||||
@ -62,6 +62,8 @@
|
||||
<view class="orderItemCenterRightRight">
|
||||
<view class="unitPrice">¥{{ subItem.AVERAGE_PRICE || '-' }}</view>
|
||||
<view class="orderItemQuantity">x{{ subItem.ORDER_COUNT || '-' }}</view>
|
||||
<view class="shopEvaluate" @click.stop="handleToEvaluate(item, subItem)">评价</view>
|
||||
<!-- v-if="item.SALEBILL_STATE > 3000 && item.SALEBILL_STATE <= 5000" -->
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -85,10 +87,10 @@
|
||||
<view class="orderItemBottomLeftMore" v-if="false">更多</view>
|
||||
</view>
|
||||
<view class="orderItemBottomRight">
|
||||
<view class="orderItemBottomRightEvaluate"
|
||||
v-if="item.SALEBILL_STATE > 3000 && item.SALEBILL_STATE <= 5000">
|
||||
<!-- <view class="orderItemBottomRightEvaluate"
|
||||
v-if="item.SALEBILL_STATE > 3000 && item.SALEBILL_STATE <= 5000" @click.stop="handleToEvaluate(item)">
|
||||
评价
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="orderItemBottomRightBuyAgain" v-if="item.SALEBILL_STATE === 1005"
|
||||
@click.stop="goEvaluate(item)">
|
||||
去付款</view>
|
||||
@ -316,6 +318,22 @@ export default {
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
handleToEvaluate(obj, shopObj) {
|
||||
console.log("obj", obj);
|
||||
console.log("shopObj", shopObj);
|
||||
uni.navigateTo({
|
||||
url:
|
||||
"/pages/newEvaluate/index?sellchildid=" +
|
||||
obj.SALEBILL_CHILD_ID +
|
||||
"&orderInternal=" +
|
||||
obj.SALEBILL_ID +
|
||||
"&proid=" +
|
||||
shopObj.COMMODITY_ID,
|
||||
// +
|
||||
// "type=" +
|
||||
// "DeliverId"
|
||||
});
|
||||
},
|
||||
parseQuery(url) {
|
||||
if (!url) return {};
|
||||
const queryString = url.split('?')[1];
|
||||
@ -690,7 +708,7 @@ export default {
|
||||
handleGoShopDetail(item, index) {
|
||||
let obj = item.GOODSList[index]
|
||||
uni.navigateTo({
|
||||
url: `/pages/shopPages/shopDetail/index?id=${obj.COMMODITY_ID}`,
|
||||
url: `/pages/shopPages/shopDetail/index?id=${obj.COMMODITY_ID}&come=buyOrder`,
|
||||
});
|
||||
}
|
||||
},
|
||||
@ -980,6 +998,14 @@ export default {
|
||||
text-transform: none;
|
||||
margin-top: 10rpx;
|
||||
}
|
||||
|
||||
.shopEvaluate {
|
||||
font-size: 24rpx;
|
||||
margin-top: 10rpx;
|
||||
padding: 4rpx 16rpx;
|
||||
background: #F2F5F6;
|
||||
border-radius: 4rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -591,6 +591,7 @@ export default {
|
||||
isCollect: false,
|
||||
shopId: "",// 商品id
|
||||
offShop: false,// 判断商品是否下架了
|
||||
come: "",// 来自哪里的判断 暂时就一个订单列表页面 进来 然后点击的返回 应该是返回上一级
|
||||
};
|
||||
},
|
||||
components: {
|
||||
@ -941,13 +942,20 @@ export default {
|
||||
},
|
||||
// 返回首页
|
||||
handleBackIndex() {
|
||||
// 根据传入的参数 判断是哪里来的 是返回 一层 还是 返回两层 还是 直接跳转去
|
||||
uni.switchTab({
|
||||
url: this.pageType === 'UnionMall' ? `/pages/shopMallPage/tradeUnionMall/index` : `/pages/shopMallPage/index/index`,
|
||||
});
|
||||
// uni.navigateBack({
|
||||
// delta: 1,
|
||||
// });
|
||||
console.log('this.comethis.come', this.come);
|
||||
|
||||
if (this.come === 'buyOrder') {
|
||||
uni.navigateBack({
|
||||
delta: 1,
|
||||
});
|
||||
} else {
|
||||
// 根据传入的参数 判断是哪里来的 是返回 一层 还是 返回两层 还是 直接跳转去
|
||||
uni.switchTab({
|
||||
url: this.pageType === 'UnionMall' ? `/pages/shopMallPage/tradeUnionMall/index` : `/pages/shopMallPage/index/index`,
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
},
|
||||
// 显示购物车
|
||||
handleShowShopCar() {
|
||||
@ -1286,6 +1294,9 @@ export default {
|
||||
uni.navigateTo({ url: "/pages/product/shopCart/index" });
|
||||
},
|
||||
decodeHTML(str) {
|
||||
if (!str) {
|
||||
return ''
|
||||
}
|
||||
return str
|
||||
.replace(/</g, "<")
|
||||
.replace(/>/g, ">")
|
||||
@ -1304,12 +1315,12 @@ export default {
|
||||
|
||||
console.log("detail", res);
|
||||
res.Data.COMMODITY_GRADE = null
|
||||
res.Data.LIMIT_TOTALCOUNT = res.Data.LIMIT_TOTALCOUNT.toString()
|
||||
res.Data.LIMIT_DAILYCOUNT = res.Data.LIMIT_DAILYCOUNT.toString()
|
||||
res.Data.REMINDER_DAY = res.Data.REMINDER_DAY.toString()
|
||||
res.Data.SEND_MODE = res.Data.SEND_MODE.toString()
|
||||
res.Data.AFTERSALE_NATRUE = res.Data.AFTERSALE_NATRUE.toString()
|
||||
res.Data.DUTY_PARAGRAPH = res.Data.DUTY_PARAGRAPH.toString()
|
||||
res.Data.LIMIT_TOTALCOUNT = res.Data.LIMIT_TOTALCOUNT ? res.Data.LIMIT_TOTALCOUNT.toString() : ""
|
||||
res.Data.LIMIT_DAILYCOUNT = res.Data.LIMIT_DAILYCOUNT ? res.Data.LIMIT_DAILYCOUNT.toString() : ""
|
||||
res.Data.REMINDER_DAY = res.Data.REMINDER_DAY ? res.Data.REMINDER_DAY.toString() : ""
|
||||
res.Data.SEND_MODE = res.Data.SEND_MODE ? res.Data.SEND_MODE.toString() : ""
|
||||
res.Data.AFTERSALE_NATRUE = res.Data.AFTERSALE_NATRUE ? res.Data.AFTERSALE_NATRUE.toString() : ""
|
||||
res.Data.DUTY_PARAGRAPH = res.Data.DUTY_PARAGRAPH ? res.Data.DUTY_PARAGRAPH.toString() : ""
|
||||
|
||||
|
||||
if (res.Data.COLLECTION_STATE === '1') {
|
||||
@ -1325,7 +1336,7 @@ export default {
|
||||
_this.good.COMMODITY_CURRPRICE = _this.good.COMMODITY_MEMBERPRICE;
|
||||
_this.good.count = 1;
|
||||
_this.pageMsg.current = 0;
|
||||
_this.pageMsg.imgeCount = res.Data.List.length || 0;
|
||||
_this.pageMsg.imgeCount = res.Data && res.Data.List && res.Data.List.length > 0 ? res.Data.List.length : 0;
|
||||
_this.good.COMMODITY_INTRO = _this.decodeHTML(
|
||||
res.Data.COMMODITY_INTRO
|
||||
);
|
||||
@ -1367,7 +1378,7 @@ export default {
|
||||
});
|
||||
}
|
||||
|
||||
_this.good.ContentImgList.map((n) => {
|
||||
_this.good && _this.good.ContentImgList && _this.good.ContentImgList.map((n) => {
|
||||
_this.detailImgList.push({ width: 750, height: 400 });
|
||||
});
|
||||
|
||||
@ -1825,6 +1836,9 @@ export default {
|
||||
if (option.id) {
|
||||
this.shopId = Number(option.id)
|
||||
}
|
||||
if (option.come) {
|
||||
this.come = option.come
|
||||
}
|
||||
|
||||
// 判断当前的购物车里面是否有东西
|
||||
let shopCarList = [];
|
||||
|
||||
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
@ -297,9 +297,13 @@ var _default = {
|
||||
});
|
||||
} else if (obj.value === 12) {
|
||||
// 售后
|
||||
uni.navigateTo({
|
||||
url: "/pages/noDataPage/index"
|
||||
});
|
||||
// uni.navigateTo({
|
||||
// url: `/pages/noDataPage/index`,
|
||||
// });
|
||||
|
||||
// uni.makePhoneCall({
|
||||
// phoneNumber: '087167199960' //仅为示例
|
||||
// });
|
||||
} else if (obj.value === 13) {
|
||||
// 加水
|
||||
uni.scanCode({
|
||||
|
||||
@ -1 +1 @@
|
||||
<view class="main data-v-2a154eee"><block wx:if="{{showList}}"><view style="width:95%;" class="data-v-2a154eee"><view data-event-opts="{{[['tap',[['handleChangeType',['$event']]]]]}}" class="topText data-v-2a154eee" bindtap="__e">{{managering?"完成":"管理"}}</view><block wx:if="{{managering}}"><view class="data-v-2a154eee"><l-drag-sort vue-id="73b6399d-1" list="{{allFunList}}" lineHeight="{{112}}" data-event-opts="{{[['^change',[['change']]]]}}" bind:change="__e" class="data-v-2a154eee" bind:__l="__l"></l-drag-sort></view></block><block wx:if="{{!managering}}"><view class="funList data-v-2a154eee"><block wx:for="{{allFunList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['handleFunClick',['$0'],[[['allFunList','',index]]]]]]]}}" class="funItem data-v-2a154eee" bindtap="__e"><view class="funLeft data-v-2a154eee"><image class="funIcon data-v-2a154eee" src="{{pageType==='spring'?item.springSrc:item.src}}"></image><text class="funText data-v-2a154eee">{{item.label||"-"}}</text></view><view class="funRight data-v-2a154eee"></view></view></block></view></block></view></block><uni-popup vue-id="73b6399d-2" data-ref="ETCRef" class="data-v-2a154eee vue-ref" bind:__l="__l" vue-slots="{{['default']}}"><view class="ETCPopup data-v-2a154eee"><view data-event-opts="{{[['tap',[['handleGoETC',[1]]]]]}}" class="ETCItem data-v-2a154eee" bindtap="__e"><image class="itemImg data-v-2a154eee" src="/static/images/home/newEtc.svg"></image><text class="itemText data-v-2a154eee">ETC小程序</text></view><view data-event-opts="{{[['tap',[['handleGoETC',[2]]]]]}}" class="ETCItem data-v-2a154eee" bindtap="__e"><image class="itemImg data-v-2a154eee" src="/static/images/home/ETCmap.svg"></image><text class="itemText data-v-2a154eee">ETC网点</text></view></view></uni-popup></view>
|
||||
<view class="main data-v-2a154eee"><block wx:if="{{showList}}"><view style="width:95%;" class="data-v-2a154eee"><view data-event-opts="{{[['tap',[['handleChangeType',['$event']]]]]}}" class="topText data-v-2a154eee" bindtap="__e">{{managering?"完成":"管理"}}</view><block wx:if="{{managering}}"><view class="data-v-2a154eee"><l-drag-sort vue-id="73b6399d-1" list="{{allFunList}}" lineHeight="{{112}}" data-event-opts="{{[['^change',[['change']]]]}}" bind:change="__e" class="data-v-2a154eee" bind:__l="__l"></l-drag-sort></view></block><block wx:if="{{!managering}}"><view class="funList data-v-2a154eee"><block wx:for="{{allFunList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['handleFunClick',['$0'],[[['allFunList','',index]]]]]]]}}" class="funItem data-v-2a154eee" bindtap="__e"><block wx:if="{{item.value!==12}}"><view class="funLeft data-v-2a154eee"><image class="funIcon data-v-2a154eee" src="{{pageType==='spring'?item.springSrc:item.src}}"></image><text class="funText data-v-2a154eee">{{item.label||"-"}}</text></view></block><block wx:else><button class="no-border-btn data-v-2a154eee" style="background-color:transparent;border-width:0;padding:0;" hover-class="none" hover-start-time="0" hover-stay-time="0" open-type="contact" data-event-opts="{{[['contact',[['onContact',['$event']]]]]}}" bindcontact="__e"><image class="funIcon data-v-2a154eee" src="{{pageType==='spring'?item.springSrc:item.src}}"></image><text class="funText data-v-2a154eee">{{item.label||"-"}}</text></button></block></view></block></view></block></view></block><uni-popup vue-id="73b6399d-2" data-ref="ETCRef" class="data-v-2a154eee vue-ref" bind:__l="__l" vue-slots="{{['default']}}"><view class="ETCPopup data-v-2a154eee"><view data-event-opts="{{[['tap',[['handleGoETC',[1]]]]]}}" class="ETCItem data-v-2a154eee" bindtap="__e"><image class="itemImg data-v-2a154eee" src="/static/images/home/newEtc.svg"></image><text class="itemText data-v-2a154eee">ETC小程序</text></view><view data-event-opts="{{[['tap',[['handleGoETC',[2]]]]]}}" class="ETCItem data-v-2a154eee" bindtap="__e"><image class="itemImg data-v-2a154eee" src="/static/images/home/ETCmap.svg"></image><text class="itemText data-v-2a154eee">ETC网点</text></view></view></uni-popup></view>
|
||||
@ -30,6 +30,7 @@
|
||||
justify-content: space-between;
|
||||
margin-bottom: 16rpx;
|
||||
position: relative;
|
||||
/* 覆盖系统生成的伪元素 */
|
||||
}
|
||||
.main .funList .funItem .funLeft.data-v-2a154eee {
|
||||
display: flex;
|
||||
@ -49,6 +50,37 @@
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
}
|
||||
.main .funList .funItem .no-border-btn.data-v-2a154eee {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: flex-start;
|
||||
}
|
||||
.main .funList .funItem .no-border-btn .funIcon.data-v-2a154eee {
|
||||
width: 72rpx;
|
||||
height: 72rpx;
|
||||
margin-right: 16rpx;
|
||||
}
|
||||
.main .funList .funItem .no-border-btn .funText.data-v-2a154eee {
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
color: #130f05;
|
||||
line-height: 40rpx;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
}
|
||||
.main .funList .funItem .no-border-btn.data-v-2a154eee::after,
|
||||
.main .funList .funItem .no-border-btn.data-v-2a154eee::before {
|
||||
content: '' !important;
|
||||
border: 0 !important;
|
||||
box-shadow: none !important;
|
||||
display: none !important;
|
||||
height: 0 !important;
|
||||
width: 0 !important;
|
||||
-webkit-transform: scale(0) !important;
|
||||
transform: scale(0) !important;
|
||||
}
|
||||
.main .funList .funItem .funRight.data-v-2a154eee {
|
||||
width: 32rpx;
|
||||
height: 32rpx;
|
||||
|
||||
@ -1544,9 +1544,12 @@ var _default = {
|
||||
});
|
||||
} else if (obj.value === 12) {
|
||||
// 售后
|
||||
uni.navigateTo({
|
||||
url: "/pages/noDataPage/index"
|
||||
});
|
||||
// uni.navigateTo({
|
||||
// url: `/pages/noDataPage/index`,
|
||||
// });
|
||||
// uni.makePhoneCall({
|
||||
// phoneNumber: '087167199960' //仅为示例
|
||||
// });
|
||||
} else if (obj.value === 13) {
|
||||
// 加水
|
||||
uni.scanCode({
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -173,6 +173,7 @@
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
/* 覆盖系统生成的伪元素 */
|
||||
}
|
||||
.main .content .funItemList .funItem .funItemIcon.data-v-57280228 {
|
||||
width: 72rpx;
|
||||
@ -188,6 +189,17 @@
|
||||
text-align: right;
|
||||
font-style: normal;
|
||||
}
|
||||
.main .content .funItemList .funItem .no-border-btn.data-v-57280228::after,
|
||||
.main .content .funItemList .funItem .no-border-btn.data-v-57280228::before {
|
||||
content: '' !important;
|
||||
border: 0 !important;
|
||||
box-shadow: none !important;
|
||||
display: none !important;
|
||||
height: 0 !important;
|
||||
width: 0 !important;
|
||||
-webkit-transform: scale(0) !important;
|
||||
transform: scale(0) !important;
|
||||
}
|
||||
.main .content .serviceDetail.data-v-57280228 {
|
||||
width: 100%;
|
||||
margin-top: 32rpx;
|
||||
|
||||
@ -191,7 +191,9 @@ var _default = {
|
||||
noPost: true,
|
||||
storeMsg: {},
|
||||
imgsList: [],
|
||||
proMsg: {} // 商品评论的列表
|
||||
proMsg: {},
|
||||
// 商品评论的列表
|
||||
currentShopIndex: 0 // 当前订单里面的商品 索引 用于看到 是第几个商品
|
||||
};
|
||||
},
|
||||
|
||||
@ -407,6 +409,7 @@ var _default = {
|
||||
if (res.ResultCode === "100") {
|
||||
var _data = res.Data;
|
||||
_this.proMsg = _data;
|
||||
console.log('_this.proMsg_this.proMsg', _this.proMsg);
|
||||
}
|
||||
});
|
||||
}
|
||||
@ -426,6 +429,7 @@ var _default = {
|
||||
this.imgsList = [];
|
||||
},
|
||||
onLoad: function onLoad(option) {
|
||||
console.log('optionoptionoptionoption', option);
|
||||
if (option.saleBillId) {
|
||||
this.saveMsg.saleBillId = option.saleBillId;
|
||||
}
|
||||
|
||||
@ -1 +1 @@
|
||||
<view class="main data-v-252ecf1a"><view class="content _div data-v-252ecf1a"><view class="contentTop _div data-v-252ecf1a"><label class="title _span data-v-252ecf1a">您对商家/菜品满意吗？</label><radio class="anonymous data-v-252ecf1a" checked="{{saveMsg.isAnonymous}}" color="#CAA97F" data-event-opts="{{[['tap',[['isAnonymous',['$event','$0'],['saveMsg']]]]]}}" bindtap="__e"><text class="data-v-252ecf1a">匿名评价</text></radio></view><view class="starRate _div data-v-252ecf1a"><image class="shopImg data-v-252ecf1a" mode="aspectFit" lazy-load="true" src="{{saveMsg.merchantsId?storeMsg.MERCHANTS_LOGO||'https://eshangtech.com/ShopICO/no-picture.png':storeMsg.MERCHANTS_LOGO||'https://eshangtech.com/ShopICO/no-picture.png'}}"></image><view class="rateBox _div data-v-252ecf1a"><view class="shopName _div data-v-252ecf1a">{{''+(saveMsg.merchantsId?storeMsg.MERCHANTS_NAME||"-":proMsg.COMMODITY_NAME||"-")+''}}</view><uni-rate vue-id="80aa121a-1" size="{{24}}" allowHalf="{{true}}" value="{{saveMsg.commentScore}}" data-event-opts="{{[['^change',[['changeRate',['$event','$0'],['saveMsg']]]],['^input',[['__set_model',['$0','commentScore','$event',[]],['saveMsg']]]]]}}" bind:change="__e" bind:input="__e" class="data-v-252ecf1a" bind:__l="__l"></uni-rate></view></view><view class="textBox _div data-v-252ecf1a"><textarea cols="30" rows="5" placeholder="{{saveMsg.merchantsId?'说说这家店的口味、环境、服务':'商品满足你的期待吗？说说你的使用心得，分享给想买的他们吧'}}" data-event-opts="{{[['input',[['__set_model',['$0','commentContent','$event',[]],['saveMsg']]]]]}}" value="{{saveMsg.commentContent}}" bindinput="__e" class="data-v-252ecf1a"></textarea><view class="tip-text data-v-252ecf1a">评价文字不可少于3字</view><view class="photo-box data-v-252ecf1a"><block wx:for="{{imgsList}}" wx:for-item="item" wx:for-index="i" wx:key="i"><view class="images data-v-252ecf1a"><image mode="aspectFit" src="{{item}}" data-event-opts="{{[['tap',[['seePhoto',['$0'],[[['imgsList','',i]]]]]]]}}" bindtap="__e" class="data-v-252ecf1a"></image><view data-event-opts="{{[['tap',[['deleteImg',[i]]]]]}}" bindtap="__e" class="_i data-v-252ecf1a"></view></view></block><view data-event-opts="{{[['tap',[['choeseImg',['$event']]]]]}}" class="add-photo data-v-252ecf1a" bindtap="__e"><view class="_i data-v-252ecf1a"></view>上传照片</view></view></view></view><view class="submitBox _div data-v-252ecf1a"><view data-event-opts="{{[['tap',[['postRate',['$event']]]]]}}" class="submit _div data-v-252ecf1a" bindtap="__e">提交</view></view></view>
|
||||
<view class="main data-v-252ecf1a"><view class="content _div data-v-252ecf1a"><view class="contentTop _div data-v-252ecf1a"><label class="title _span data-v-252ecf1a">您对商家/菜品满意吗？</label><radio class="anonymous data-v-252ecf1a" checked="{{saveMsg.isAnonymous}}" color="#CAA97F" data-event-opts="{{[['tap',[['isAnonymous',['$event','$0'],['saveMsg']]]]]}}" bindtap="__e"><text class="data-v-252ecf1a">匿名评价</text></radio></view><view class="starRate _div data-v-252ecf1a"><image class="shopImg data-v-252ecf1a" mode="aspectFit" lazy-load="true" src="{{saveMsg.merchantsId?storeMsg.MERCHANTS_LOGO||storeMsg.IMAGE_PATH||'https://eshangtech.com/ShopICO/no-picture.png':storeMsg.MERCHANTS_LOGO||proMsg.IMAGE_PATH||'https://eshangtech.com/ShopICO/no-picture.png'}}"></image><view class="rateBox _div data-v-252ecf1a"><view class="shopName _div data-v-252ecf1a">{{''+(saveMsg.merchantsId?storeMsg.MERCHANTS_NAME||"-":proMsg.COMMODITY_NAME||"-")+''}}</view><uni-rate vue-id="80aa121a-1" size="{{24}}" allowHalf="{{true}}" value="{{saveMsg.commentScore}}" data-event-opts="{{[['^change',[['changeRate',['$event','$0'],['saveMsg']]]],['^input',[['__set_model',['$0','commentScore','$event',[]],['saveMsg']]]]]}}" bind:change="__e" bind:input="__e" class="data-v-252ecf1a" bind:__l="__l"></uni-rate></view></view><view class="textBox _div data-v-252ecf1a"><textarea cols="30" rows="5" placeholder="{{saveMsg.merchantsId?'说说这家店的口味、环境、服务':'商品满足你的期待吗？说说你的使用心得，分享给想买的他们吧'}}" data-event-opts="{{[['input',[['__set_model',['$0','commentContent','$event',[]],['saveMsg']]]]]}}" value="{{saveMsg.commentContent}}" bindinput="__e" class="data-v-252ecf1a"></textarea><view class="tip-text data-v-252ecf1a">评价文字不可少于3字</view><view class="photo-box data-v-252ecf1a"><block wx:for="{{imgsList}}" wx:for-item="item" wx:for-index="i" wx:key="i"><view class="images data-v-252ecf1a"><image mode="aspectFit" src="{{item}}" data-event-opts="{{[['tap',[['seePhoto',['$0'],[[['imgsList','',i]]]]]]]}}" bindtap="__e" class="data-v-252ecf1a"></image><view data-event-opts="{{[['tap',[['deleteImg',[i]]]]]}}" bindtap="__e" class="_i data-v-252ecf1a"></view></view></block><view data-event-opts="{{[['tap',[['choeseImg',['$event']]]]]}}" class="add-photo data-v-252ecf1a" bindtap="__e"><view class="_i data-v-252ecf1a"></view>上传照片</view></view></view></view><view class="submitBox _div data-v-252ecf1a"><view data-event-opts="{{[['tap',[['postRate',['$event']]]]]}}" class="submit _div data-v-252ecf1a" bindtap="__e">提交</view></view></view>
|
||||
@ -128,7 +128,9 @@ var render = function () {
|
||||
var l1 = _vm.__map(_vm.orderList, function (item, index) {
|
||||
var $orig = _vm.__get_orig(item)
|
||||
var l0 = _vm.__map(
|
||||
item.GOODSList.slice(0, item.isShowMore ? item.GOODSList.length : 5),
|
||||
item && item.GOODSList
|
||||
? item.GOODSList.slice(0, item.isShowMore ? item.GOODSList.length : 5)
|
||||
: [],
|
||||
function (subItem, subIndex) {
|
||||
var $orig = _vm.__get_orig(subItem)
|
||||
var g0 = subItem.IMAGE_URL ? subItem.IMAGE_URL.split(",") : null
|
||||
@ -147,6 +149,26 @@ var render = function () {
|
||||
g2: g2,
|
||||
}
|
||||
})
|
||||
if (!_vm._isMounted) {
|
||||
_vm.e0 = function ($event, item, subIndex) {
|
||||
var _temp = arguments[arguments.length - 1].currentTarget.dataset,
|
||||
_temp2 = _temp.eventParams || _temp["event-params"],
|
||||
item = _temp2.item,
|
||||
subIndex = _temp2.subIndex
|
||||
var _temp, _temp2
|
||||
$event.stopPropagation()
|
||||
return _vm.handleGoShopDetail(item, subIndex)
|
||||
}
|
||||
_vm.e1 = function ($event, item, subItem) {
|
||||
var _temp3 = arguments[arguments.length - 1].currentTarget.dataset,
|
||||
_temp4 = _temp3.eventParams || _temp3["event-params"],
|
||||
item = _temp4.item,
|
||||
subItem = _temp4.subItem
|
||||
var _temp3, _temp4
|
||||
$event.stopPropagation()
|
||||
return _vm.handleToEvaluate(item, subItem)
|
||||
}
|
||||
}
|
||||
_vm.$mp.data = Object.assign(
|
||||
{},
|
||||
{
|
||||
@ -348,6 +370,16 @@ var _default = {
|
||||
}))();
|
||||
},
|
||||
methods: {
|
||||
handleToEvaluate: function handleToEvaluate(obj, shopObj) {
|
||||
console.log("obj", obj);
|
||||
console.log("shopObj", shopObj);
|
||||
uni.navigateTo({
|
||||
url: "/pages/newEvaluate/index?sellchildid=" + obj.SALEBILL_CHILD_ID + "&orderInternal=" + obj.SALEBILL_ID + "&proid=" + shopObj.COMMODITY_ID
|
||||
// +
|
||||
// "type=" +
|
||||
// "DeliverId"
|
||||
});
|
||||
},
|
||||
parseQuery: function parseQuery(url) {
|
||||
if (!url) return {};
|
||||
var queryString = url.split('?')[1];
|
||||
@ -706,7 +738,7 @@ var _default = {
|
||||
handleGoShopDetail: function handleGoShopDetail(item, index) {
|
||||
var obj = item.GOODSList[index];
|
||||
uni.navigateTo({
|
||||
url: "/pages/shopPages/shopDetail/index?id=".concat(obj.COMMODITY_ID)
|
||||
url: "/pages/shopPages/shopDetail/index?id=".concat(obj.COMMODITY_ID, "&come=buyOrder")
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -255,6 +255,13 @@
|
||||
text-transform: none;
|
||||
margin-top: 10rpx;
|
||||
}
|
||||
.main .orderListBox .orderItem .orderItemCenter .orderItemCenterRight .orderItemCenterRightRight .shopEvaluate.data-v-50f48f45 {
|
||||
font-size: 24rpx;
|
||||
margin-top: 10rpx;
|
||||
padding: 4rpx 16rpx;
|
||||
background: #F2F5F6;
|
||||
border-radius: 4rpx;
|
||||
}
|
||||
.main .orderListBox .orderItem .is_more.data-v-50f48f45 {
|
||||
width: 400rpx;
|
||||
height: 40rpx;
|
||||
|
||||
@ -328,7 +328,9 @@ var _default = {
|
||||
isCollect: false,
|
||||
shopId: "",
|
||||
// 商品id
|
||||
offShop: false // 判断商品是否下架了
|
||||
offShop: false,
|
||||
// 判断商品是否下架了
|
||||
come: "" // 来自哪里的判断 暂时就一个订单列表页面 进来 然后点击的返回 应该是返回上一级
|
||||
};
|
||||
},
|
||||
|
||||
@ -660,13 +662,17 @@ var _default = {
|
||||
},
|
||||
// 返回首页
|
||||
handleBackIndex: function handleBackIndex() {
|
||||
// 根据传入的参数 判断是哪里来的 是返回 一层 还是 返回两层 还是 直接跳转去
|
||||
uni.switchTab({
|
||||
url: this.pageType === 'UnionMall' ? "/pages/shopMallPage/tradeUnionMall/index" : "/pages/shopMallPage/index/index"
|
||||
});
|
||||
// uni.navigateBack({
|
||||
// delta: 1,
|
||||
// });
|
||||
console.log('this.comethis.come', this.come);
|
||||
if (this.come === 'buyOrder') {
|
||||
uni.navigateBack({
|
||||
delta: 1
|
||||
});
|
||||
} else {
|
||||
// 根据传入的参数 判断是哪里来的 是返回 一层 还是 返回两层 还是 直接跳转去
|
||||
uni.switchTab({
|
||||
url: this.pageType === 'UnionMall' ? "/pages/shopMallPage/tradeUnionMall/index" : "/pages/shopMallPage/index/index"
|
||||
});
|
||||
}
|
||||
},
|
||||
// 显示购物车
|
||||
handleShowShopCar: function handleShowShopCar() {
|
||||
@ -1024,6 +1030,9 @@ var _default = {
|
||||
});
|
||||
},
|
||||
decodeHTML: function decodeHTML(str) {
|
||||
if (!str) {
|
||||
return '';
|
||||
}
|
||||
return str.replace(/</g, "<").replace(/>/g, ">").replace(/&/g, "&").replace(/"/g, '"').replace(/ /g, " ");
|
||||
},
|
||||
getDetail: function getDetail(id) {
|
||||
@ -1044,12 +1053,12 @@ var _default = {
|
||||
res = _context3.sent;
|
||||
console.log("detail", res);
|
||||
res.Data.COMMODITY_GRADE = null;
|
||||
res.Data.LIMIT_TOTALCOUNT = res.Data.LIMIT_TOTALCOUNT.toString();
|
||||
res.Data.LIMIT_DAILYCOUNT = res.Data.LIMIT_DAILYCOUNT.toString();
|
||||
res.Data.REMINDER_DAY = res.Data.REMINDER_DAY.toString();
|
||||
res.Data.SEND_MODE = res.Data.SEND_MODE.toString();
|
||||
res.Data.AFTERSALE_NATRUE = res.Data.AFTERSALE_NATRUE.toString();
|
||||
res.Data.DUTY_PARAGRAPH = res.Data.DUTY_PARAGRAPH.toString();
|
||||
res.Data.LIMIT_TOTALCOUNT = res.Data.LIMIT_TOTALCOUNT ? res.Data.LIMIT_TOTALCOUNT.toString() : "";
|
||||
res.Data.LIMIT_DAILYCOUNT = res.Data.LIMIT_DAILYCOUNT ? res.Data.LIMIT_DAILYCOUNT.toString() : "";
|
||||
res.Data.REMINDER_DAY = res.Data.REMINDER_DAY ? res.Data.REMINDER_DAY.toString() : "";
|
||||
res.Data.SEND_MODE = res.Data.SEND_MODE ? res.Data.SEND_MODE.toString() : "";
|
||||
res.Data.AFTERSALE_NATRUE = res.Data.AFTERSALE_NATRUE ? res.Data.AFTERSALE_NATRUE.toString() : "";
|
||||
res.Data.DUTY_PARAGRAPH = res.Data.DUTY_PARAGRAPH ? res.Data.DUTY_PARAGRAPH.toString() : "";
|
||||
if (res.Data.COLLECTION_STATE === '1') {
|
||||
_this.isCollect = true;
|
||||
}
|
||||
@ -1061,7 +1070,7 @@ var _default = {
|
||||
_this.good.COMMODITY_CURRPRICE = _this.good.COMMODITY_MEMBERPRICE;
|
||||
_this.good.count = 1;
|
||||
_this.pageMsg.current = 0;
|
||||
_this.pageMsg.imgeCount = res.Data.List.length || 0;
|
||||
_this.pageMsg.imgeCount = res.Data && res.Data.List && res.Data.List.length > 0 ? res.Data.List.length : 0;
|
||||
_this.good.COMMODITY_INTRO = _this.decodeHTML(res.Data.COMMODITY_INTRO);
|
||||
// _this.good.COMMODITY_DESC = _this.decodeHTML(res.Data.COMMODITY_DESC);
|
||||
|
||||
@ -1091,7 +1100,7 @@ var _default = {
|
||||
});
|
||||
});
|
||||
}
|
||||
_this.good.ContentImgList.map(function (n) {
|
||||
_this.good && _this.good.ContentImgList && _this.good.ContentImgList.map(function (n) {
|
||||
_this.detailImgList.push({
|
||||
width: 750,
|
||||
height: 400
|
||||
@ -1514,6 +1523,9 @@ var _default = {
|
||||
if (option.id) {
|
||||
_this8.shopId = Number(option.id);
|
||||
}
|
||||
if (option.come) {
|
||||
_this8.come = option.come;
|
||||
}
|
||||
|
||||
// 判断当前的购物车里面是否有东西
|
||||
shopCarList = [];
|
||||
@ -1526,9 +1538,9 @@ var _default = {
|
||||
if (shopCarList && shopCarList.length > 0) {
|
||||
_this8.shopCarList = shopCarList;
|
||||
}
|
||||
_context4.next = 15;
|
||||
_context4.next = 16;
|
||||
return _this8.getDetail(option.id);
|
||||
case 15:
|
||||
case 16:
|
||||
_this8.handleGetIsCollect();
|
||||
_this8.$utils.addUserBehaviorNew({
|
||||
behaviorRecordDesc: "\u67E5\u770B\u5546\u54C1\u3010".concat(_this8.good.COMMODITY_NAME, "\u3011\u8BE6\u60C5")
|
||||
@ -1553,7 +1565,7 @@ var _default = {
|
||||
// this.pageMsg.buyCount = 1;
|
||||
|
||||
// this.getRate();
|
||||
case 19:
|
||||
case 20:
|
||||
case "end":
|
||||
return _context4.stop();
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user